]> git.ipfire.org Git - thirdparty/ccache.git/commit
projects / thirdparty / ccache.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5a5b5b7 0010ba1)
Merge branch 'maint'
authorJoel Rosdahl <joel@rosdahl.net>
Thu, 9 Aug 2012 13:10:36 +0000 (15:10 +0200)
committerJoel Rosdahl <joel@rosdahl.net>
Thu, 9 Aug 2012 13:10:36 +0000 (15:10 +0200)
commit02f9e065390ee7505be1d35af9c6dab10a23e492
tree41e59c74b904428003d77cb790107518fbbad390tree
parent5a5b5b75daea3beb7b21a78100adf76176317f65commit | diff
parent0010ba1ac6071a5585b8a59df896855b1d711974commit | diff
Merge branch 'maint'

* maint:
  Rename static_assert macro to avoid clash with any preexisting static_assert

Conflicts:
manifest.c
manifest.c diff1 | diff2 | blob | history
Mirror of https://github.com/ccache/ccache.git