]> granicus.if.org Git - libjpeg-turbo/commitdiff
projects / libjpeg-turbo / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 108b1cd 2d4b2f1)
Merge branch 'master' into dev
authorDRC <information@libjpeg-turbo.org>
Fri, 21 Oct 2016 00:17:30 +0000 (19:17 -0500)
committerDRC <information@libjpeg-turbo.org>
Fri, 21 Oct 2016 00:17:30 +0000 (19:17 -0500)
1  2 
.travis.yml patch | diff1 | diff2 | blob | history

diff --cc .travis.yml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.