]> git.ipfire.org Git - thirdparty/ccache.git/commit
projects / thirdparty / ccache.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8c018f6 222ce68)
Merge branch 'master' into config
authorJoel Rosdahl <joel@rosdahl.net>
Fri, 6 Jan 2012 16:03:38 +0000 (17:03 +0100)
committerJoel Rosdahl <joel@rosdahl.net>
Fri, 6 Jan 2012 16:03:38 +0000 (17:03 +0100)
commitaab78af38c0d21356c887c1ec3bb3699e4052e81
tree830da34e85d202435c6c387e93d33b24b8496b78tree
parent8c018f6315044e6d9e4c992e2b3e7be0ebb81d96commit | diff
parent222ce68f156941d19f064878bda406c8704247cbcommit | diff
Merge branch 'master' into config

* master:
  Merge branch 'maint'
  Sync mdfour.c license header with other files, notably fixing FSF's address.

Conflicts:
ccache.c
MANUAL.txt diff1 | diff2 | blob | history
ccache.c diff1 | diff2 | blob | history
ccache.h diff1 | diff2 | blob | history
execute.c diff1 | diff2 | blob | history
test.sh diff1 | diff2 | blob | history
Mirror of https://github.com/ccache/ccache.git