]> granicus.if.org Git - libjpeg-turbo/commit
Merge branch 'master' into dev
authorDRC <information@libjpeg-turbo.org>
Wed, 28 Jun 2017 20:30:41 +0000 (15:30 -0500)
committerDRC <information@libjpeg-turbo.org>
Wed, 28 Jun 2017 20:30:41 +0000 (15:30 -0500)
commitdedce66eb59968133f4c7e07987317f8ef25c6fe
tree661da5a362e4ca2d899f392d0abe3b7a7f162db6
parentaba6ae5950702d85dcc3989d23b2ec5872f6ddc4
parentb0971e47d76fdb81270e93bbf11ff5558073350d
Merge branch 'master' into dev
CMakeLists.txt
ChangeLog.md
doc/html/group___turbo_j_p_e_g.html
java/TJBench.java
tjbench.c
turbojpeg.h