]> granicus.if.org Git - libjpeg-turbo/commitdiff
Merge branch 'master' into dev
authorDRC <information@libjpeg-turbo.org>
Thu, 20 Oct 2016 06:37:40 +0000 (01:37 -0500)
committerDRC <information@libjpeg-turbo.org>
Thu, 20 Oct 2016 06:37:40 +0000 (01:37 -0500)
1  2 
.travis.yml
simd/CMakeLists.txt

diff --cc .travis.yml
Simple merge
Simple merge