]> git.ipfire.org Git - thirdparty/ccache.git/commitdiff
projects / thirdparty / ccache.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b05fe44 9601eb5)
Merge branch '3.2-maint'
authorJoel Rosdahl <joel@rosdahl.net>
Sat, 19 Dec 2015 16:20:26 +0000 (17:20 +0100)
committerJoel Rosdahl <joel@rosdahl.net>
Sat, 19 Dec 2015 16:20:26 +0000 (17:20 +0100)
* 3.2-maint:
  Add travis configuration
  Update NEWS
  Don't assume that mkstemp leaves template unmodified on error

Conflicts:
.travis.yml

1  2 
NEWS.txt patch | diff1 | diff2 | blob | history

diff --cc NEWS.txt
Simple merge
Mirror of https://github.com/ccache/ccache.git