From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 16 Aug 2015 12:14:46 +0000 (+0200)
Subject: Merge branch '3.2-maint'
X-Git-Tag: v3.3~157
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9b030311ca25eae1ffba98d0f28879e1326bebb;p=thirdparty%2Fccache.git

Merge branch '3.2-maint'

* 3.2-maint:
  Prepare for v3.2.3
  Bail out on --save-temps, an alias for -save-temps
  Use correct key for "file info indexes" in --dump-manifest output
  Exit properly from exit handler
---

b9b030311ca25eae1ffba98d0f28879e1326bebb
diff --cc NEWS.txt
index b5e860196,f13feeb7f..f2898ad10
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -2,17 -2,17 +2,30 @@@ ccache new
  ===========
  
  
- Unreleased
- ----------
++Unreleased 3.3
++--------------
 +
 +New features and improvements
 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +
- - Added support for compiler option `-gsplit-dwarf`.
- 
 +- Added support for cuda including the -optf/--options-file option.
 +
 +
++Bug fixes
++~~~~~~~~~
++
++
+ ccache 3.2.3
+ ------------
+ Release date: 2015-08-16
+ 
+ 
+ New features and improvements
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 
+ - Added support for compiler option `-gsplit-dwarf`.
+ 
+ 
  Bug fixes
  ~~~~~~~~~