Merge branch 'master' into dev

author DRC <information@libjpeg-turbo.org>

Thu, 15 Aug 2019 03:08:59 +0000 (22:08 -0500)

committer DRC <information@libjpeg-turbo.org>

Thu, 15 Aug 2019 03:08:59 +0000 (22:08 -0500)
author DRC <information@libjpeg-turbo.org>
Thu, 15 Aug 2019 03:08:59 +0000 (22:08 -0500)
committer DRC <information@libjpeg-turbo.org>
Thu, 15 Aug 2019 03:08:59 +0000 (22:08 -0500)
diff --cc .travis.yml
Simple merge
diff --cc CMakeLists.txt
Simple merge
diff --cc ChangeLog.md
Simple merge
author	DRC <information@libjpeg-turbo.org>
	Thu, 15 Aug 2019 03:08:59 +0000 (22:08 -0500)
committer	DRC <information@libjpeg-turbo.org>
	Thu, 15 Aug 2019 03:08:59 +0000 (22:08 -0500)
		1	2
.travis.yml	patch \|	diff1 \|	diff2 \|	blob \| history
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
ChangeLog.md	patch \|	diff1 \|	diff2 \|	blob \| history