From: Joel Rosdahl <joel@rosdahl.net>
Date: Thu, 8 Oct 2015 19:15:52 +0000 (+0200)
Subject: Merge branch '3.2-maint'
X-Git-Tag: v3.3~152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38670b4a11703b10bfa743c490cd5a004507f41e;p=thirdparty%2Fccache.git

Merge branch '3.2-maint'

* 3.2-maint:
  Prepare for v3.2.4

Conflicts:
	NEWS.txt
---

38670b4a11703b10bfa743c490cd5a004507f41e
diff --cc NEWS.txt
index 3cb8493ff,084879ddd..dac5bfe03
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -2,21 -2,10 +2,23 @@@ ccache new
  ===========
  
  
 +Unreleased 3.3
 +--------------
 +
 +New features and improvements
 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +
 +- Added support for cuda including the -optf/--options-file option.
 +
 +
 +Bug fixes
 +~~~~~~~~~
 +
 +
- Unreleased 3.2.4
- ----------------
+ ccache 3.2.4
+ ------------
+ Release date: 2015-10-08
+ 
  
  Bug fixes
  ~~~~~~~~~