Merge branch 'maint'

* maint:
  Prepare for v3.1.10
  Update NEWS
  ignore config.cache files

Conflicts:
	NEWS.txt

diff --cc .gitignore
Simple merge

diff --cc AUTHORS.txt
index ad0f71905c95827461c10eab1b4aceb2a3352a40,7ce3afaea6ea49113f1a0a2168c07f66d59cd36c..0849e0ba0615254e9f12a9ac7ee95acb410c129f
--- 1/AUTHORS.txt
--- 2/AUTHORS.txt
+++ b/AUTHORS.txt
@@@ -26,9 -23,9 +26,10 @@@ ccache is a collective work with contri
  * Lalit Chhabra <lchhabra@linuxmail.org>
  * Lars Gustäbel <lars@gustaebel.de>
  * Lubos Lunak <l.lunak@suse.cz>
 +* Mark Starovoytov <starovoytov.mark@googlemail.com>
  * Martin Pool <mbp@sourcefrog.net>
  * Michael Meeks <michael.meeks@suse.com>
+ * Mike Frysinger <vapier@gentoo.org>
  * Owen Mann <owen@mann.org>
  * Patrick von Reth <vonreth@kde.org>
  * Paul Griffith <paulg@cse.yorku.ca>

diff --cc NEWS.txt
index 05d32e11ef7879de098202259953bd4d781cf119,063cdc28c45fad0ab2efccbf9adaecc0bea556c2..d4a8bf25fe347260f5ba6673540eb05c9d6081d0
--- 1/NEWS.txt
--- 2/NEWS.txt
+++ b/NEWS.txt
@@@ -2,57 -2,9 +2,57 @@@ ccache new
  ===========
  
  
- ccache 3.1.notyetreleased
- -------------------------
- Release date: unknown
 +ccache 3.2.notyetreleased
 +-------------------------
 +Release date: unknown
 +
 +
 +New features and improvements
 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +
 +- Added support for configuring ccache via one or several configuration files
 +  instead of via environment variables. Environment variables still have
 +  priority but are no longer the recommended way of customizing ccache
 +  behavior. See the manual for more information.
 +
 +- Made creation of temporary directories and cache directories smarter to avoid
 +  unnecessary `stat()` calls.
 +
 +- Various improvements and fixes on win32.
 +
 +- Improved test suite.
 +
 +- Added `--dump-manifest` command-line option for debugging purposes.
 +
 +- Improved efficiency of the algorithm that scans for `__DATE_` and `__TIME__`
 +  tokens in the hashed source code.
 +
 +- Upgraded bundled zlib to version 1.2.8.
 +
 +- Added support for several binaries in `CCACHE_PREFIX` (separated by space).
 +
 +- Compiler options `-fprofile-generate`, `-fprofile-arcs` and `-fprofile-use`
 +  are now handled without bailing.
 +
 +- The displaying and interpretation of cache size has been changed to use SI
 +  units.
 +
 +- Default cache size is now 5 GB (was previously 1 GiB).
 +
 +
 +[News added up to commit 757ffb19cb69f88db48f732eb8d3fc8eeb333e17.]
 +
 +
 +Bug fixes
 +~~~~~~~~~
 +
 +- The `-c` option is no longer passed to the preprocessor. This fixes problems
 +  with clang and Solaris's C++ compiler.
 +
 +
+ ccache 3.1.10
+ -------------
+ Release date: 2014-10-19
  
  
  New features and improvements