]> granicus.if.org Git - libjpeg-turbo/commitdiff
Big oops. wrjpgcom on Windows was being built using the rdjpgcom source.
authorDRC <dcommander@users.sourceforge.net>
Sun, 22 Jun 2014 20:46:48 +0000 (20:46 +0000)
committerDRC <dcommander@users.sourceforge.net>
Sun, 22 Jun 2014 20:46:48 +0000 (20:46 +0000)
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@1325 632fc199-4ca6-4c93-a231-07263d6284db

1  2 
CMakeLists.txt
ChangeLog.txt

diff --cc CMakeLists.txt
Simple merge
diff --cc ChangeLog.txt
index e8b18afa1c263ea4da5da6ddc3ca0b80196c2775,ac47db2f2251df187af37c5ffa7a9aad0736575f..b6901336186e95096aa6d3830b10d6fa6579567b
@@@ -77,6 -14,8 +77,8 @@@ set to JMSG_COPYRIGHT
  characters to be passed on the command line, which was causing it to generate
  incorrect JPEG files.
  
 -[4] Fixed a bug in the build system that was causing the Windows version of
++[12] Fixed a bug in the build system that was causing the Windows version of
+ wrjpgcom to be built using the rdjpgcom code.
  
  
  1.3.1