]> git.ipfire.org Git - thirdparty/ccache.git/commitdiff
Merge branch '3.3-maint'
authorJoel Rosdahl <joel@rosdahl.net>
Wed, 28 Sep 2016 20:33:22 +0000 (22:33 +0200)
committerJoel Rosdahl <joel@rosdahl.net>
Wed, 28 Sep 2016 20:33:22 +0000 (22:33 +0200)
* 3.3-maint:
  Prepare for v3.3.2
  Prepare for v3.2.9
  Disable direct mode for "-Wp," with multiple preprocessor options

1  2 
NEWS.txt
ccache.c

diff --cc NEWS.txt
index a69dd818da4ccbac0fd66e183549091ef2acd720,8ebef4e358817b789ad10c154a36f1b05f7fc1e1..75480085f47d097e4dcade90da9b82605320c46a
+++ b/NEWS.txt
@@@ -1,18 -1,9 +1,19 @@@
  ccache news
  ===========
  
- Unreleased 3.3.2
- ----------------
 +Unreleased 3.4
 +--------------
 +
 +New features and improvements
 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +
 +- The compiler option form `--sysroot arg` is now handled like the documented
 +  `--sysroot=arg` form.
 +
 +
+ ccache 3.3.2
+ ------------
+ Release date: 2016-09-28
  
  Bug fixes
  ~~~~~~~~~
diff --cc ccache.c
Simple merge