diff options
| author | Christian Beier <dontmind@freeshell.org> | 2012-04-25 12:55:03 +0200 |
|---|---|---|
| committer | Christian Beier <dontmind@freeshell.org> | 2012-04-25 12:55:03 +0200 |
| commit | 413ca0dfef83b98f7b230e0596ac086d42eaad4e (patch) | |
| tree | b36ca82ac24402f3f0f5a7085f0561757e7b56f5 /libvncserver/Makefile.am | |
| parent | 2524573678fbdb195cbc9ba2f92e0f58c205ad10 (diff) | |
| parent | 1df6bffd9e7ff5106ffb5f3bc1938a14ea1f72cf (diff) | |
| download | libtdevnc-413ca0dfef83b98f7b230e0596ac086d42eaad4e.tar.gz libtdevnc-413ca0dfef83b98f7b230e0596ac086d42eaad4e.zip | |
Merge branch 'turbovnc'
Conflicts, resolved manually:
AUTHORS
Diffstat (limited to 'libvncserver/Makefile.am')
| -rw-r--r-- | libvncserver/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libvncserver/Makefile.am b/libvncserver/Makefile.am index fce398d..c0cd4c3 100644 --- a/libvncserver/Makefile.am +++ b/libvncserver/Makefile.am @@ -46,7 +46,7 @@ EXTRA_DIST=tableinit24.c tableinittctemplate.c tabletranstemplate.c \ if HAVE_LIBZ ZLIBSRCS = zlib.c zrle.c zrleoutstream.c zrlepalettehelper.c ../common/zywrletemplate.c if HAVE_LIBJPEG -TIGHTSRCS = tight.c +TIGHTSRCS = tight.c ../common/turbojpeg.c endif endif |