granicus.if.org Git - libjpeg-turbo/commit

]> granicus.if.org Git - libjpeg-turbo/commit

projects / libjpeg-turbo / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 616b4e2 19b393b)

author	DRC <information@libjpeg-turbo.org>
	Sat, 18 Nov 2017 01:00:53 +0000 (19:00 -0600)
committer	DRC <information@libjpeg-turbo.org>
	Sat, 18 Nov 2017 01:00:53 +0000 (19:00 -0600)
commit	4893e5d8b82931e384816cac2d54b10bf324f64f
tree	8aabb067205f92db529912a64b85813c3fcfe192	tree \| snapshot
parent	616b4e2d1b5dba6a431d2875c4cd9c1852c6bb6b	commit \| diff
parent	19b393b62422c97d97de4a5f2943d2cf4dc44120	commit \| diff

Merge branch 'master' into dev

12 files changed:

ChangeLog.md	diff1 \|	diff2 \|	blob \| history
cmakescripts/testclean.cmake	diff1 \|	diff2 \|	blob \| history
djpeg.1	diff1 \|	diff2 \|	blob \| history
djpeg.c	diff1 \|	diff2 \|	blob \| history
doc/html/group___turbo_j_p_e_g.html	diff1 \|	diff2 \|	blob \| history
java/TJBench.java	diff1 \|	diff2 \|	blob \| history
tjbench.c	diff1 \|	diff2 \|	blob \| history
tjbenchtest.in	diff1 \|	diff2 \|	blob \| history
tjbenchtest.java.in	diff1 \|	diff2 \|	blob \| history
tjexampletest.in	diff1 \|	diff2 \|	blob \| history
turbojpeg.c	diff1 \|	diff2 \|	blob \| history
turbojpeg.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.