]> git.ipfire.org Git - thirdparty/ccache.git/commit
Merge branch 'maint'
authorJoel Rosdahl <joel@rosdahl.net>
Wed, 8 Jan 2014 20:28:40 +0000 (21:28 +0100)
committerJoel Rosdahl <joel@rosdahl.net>
Wed, 8 Jan 2014 20:28:40 +0000 (21:28 +0100)
commitc0b40b8b634ff966a097598447317a9f7754a53a
tree25186ecc5cac13c2b7bed51e01ea90cd88337660
parentb08fc595b03676b0da807498e034588e08030a99
parent708d9110a103bd49437be7bff1e82697fff68d0b
Merge branch 'maint'

* maint:
  Require CCACHE_SLOPPINESS=pch_defines,time_macros opt-in to enable PCH handling
  doc: Mention that --ccache-skip currently does not mean "skip hashing option"
  Don't hash compiler option -fdebug-prefix-map=

Conflicts:
MANUAL.txt
ccache.c
ccache.h
test.sh
MANUAL.txt
ccache.c
ccache.h
conf.c
test.sh
test/test_conf.c