From: Joel Rosdahl <joel@rosdahl.net>
Date: Sat, 11 Aug 2012 09:09:41 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v3.2~99
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=88cc91f980d5979b24830d94192c234f06df3568;p=thirdparty%2Fccache.git

Merge branch 'maint'

* maint:
  Prepare for v3.1.8
  Use C89-style comments
  Add quicktest Makefile target

Conflicts:
	AUTHORS.txt
	Makefile.in
	test/test_hashutil.c
---

88cc91f980d5979b24830d94192c234f06df3568
diff --cc AUTHORS.txt
index 7bdd49b20,22d0707bf..f7a846338
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@@ -11,19 -11,19 +11,23 @@@ ccache is a collective work with contri
  * Bernhard Bauer <bauerb@google.com>
  * Björn Jacke <bj@sernet.de>
  * Bo Rydberg <bolry@hotmail.com>
 +* Chris AtLee <chris@atlee.ca>
  * Clemens Rabe <crabe@gmx.de>
+ * Eric Blau <Eric.Blau@tekelec.com>
  * Francois Marier <francois@debian.org>
  * Joel Rosdahl <joel@rosdahl.net>
  * John Coiner <john.coiner@amd.com>
 +* Jon Bernard <jbernard@tuxion.com>
 +* Justin Lebar <justin.lebar@gmail.com>
  * Karl Chen <quarl@cs.berkeley.edu>
  * Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>
+ * 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>
  * Owen Mann <owen@mann.org>
+ * Patrick von Reth <vonreth@kde.org>
  * Paul Griffith <paulg@cse.yorku.ca>
  * RW <fbsd06@mlists.homeunix.com>
  * Ramiro Polla <ramiro.polla@gmail.com>