]> git.ipfire.org Git - thirdparty/ccache.git/commit
Merge branch '3.1-maint' into 3.2-maint
authorJoel Rosdahl <joel@rosdahl.net>
Fri, 26 Dec 2014 09:10:20 +0000 (10:10 +0100)
committerJoel Rosdahl <joel@rosdahl.net>
Fri, 26 Dec 2014 09:10:20 +0000 (10:10 +0100)
commit7fc362a8a1a7be23492fca739bf11b61fb5899bb
tree86c9e1c858d624e35cb97a83163037ee88dca2a4
parentb9bed1e1c59dfae6c7c056f29dad0b4a04df418b
parentd2786183f35efe33c2230c68c70b1a911e89f89e
Merge branch '3.1-maint' into 3.2-maint

* 3.1-maint:
  Include info on CCACHE_CPP2 in hash

Conflicts:
NEWS.txt
ccache.c
test.sh
NEWS.txt
ccache.c
test.sh