r695 : Back out CMYK-to-RGB conversions.  There is really no way to properly do CMYK-to-RGB conversion without color management, which is out of scope for libjpeg-turbo.  Applications wishing to do a trivial conversion, such as was implemented in these routines, can simply request CMYK output and do the trivial conversion themselves (or, even better, use an OSS color management library.)  We should not encourage the use of in-library CMYK-to-RGB conversion as a substitute for color management.
r696 : Use descriptions from libjpeg v8
r697 : Fix compile error when JCS_EXTENSIONS!=1
r702 : Eliminate main is usually a function warnings
r703 : Implement a custom DCT filter callback for lossless transforms
r704
r705 : Fix 'make headers' with out-of-tree builds
r706 Fix 'make docs' with out-of-tree builds
r707 : Implement custom filter callback in Java
r708 : Add a couple of missing pages
r709 : Add TJCustomFilter to Windows build
Always link tjbench against jpeg-static instead of the JPEG DLL, since we are only using libjpeg for bitmap I/O
r711 : Wordsmithing
r712 : Oops.  Don't try to use custom filter at the C level unless it is defined at the Java level.
r713 : Fix compiler warning
r714 : Make sure we don't call jpeg_destroy_[de]compress() on an uninitialized struct, as bad mojo can ensue.
r715 : ARM + iOS instructions
r716 : iOS doesn't allow dynamic linking against non-system libs
r717 : Fix make dist
r717

Conflicts:
	ChangeLog.txt