]> git.ipfire.org Git - thirdparty/ccache.git/commitdiff
projects / thirdparty / ccache.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 71e4954 5d8ba55)
Merge branch '3.2-maint'
authorJoel Rosdahl <joel@rosdahl.net>
Tue, 27 Oct 2015 21:14:36 +0000 (22:14 +0100)
committerJoel Rosdahl <joel@rosdahl.net>
Tue, 27 Oct 2015 21:14:36 +0000 (22:14 +0100)
* 3.2-maint:
  Correct manual regarding __DATE_, __TIME__ and __FILE__ macros
  Include m4 files used by configure.ac in dist archive

Conflicts:
NEWS.txt

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

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