From: Andre Noll <maan@systemlinux.org>
Date: Thu, 21 Apr 2011 20:56:56 +0000 (+0200)
Subject: Merge branch 't/autogen'
X-Git-Tag: v0.4.7~16
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=c0dca63e02352cae6a8c241dba4bc0d2c7cde050;p=paraslash.git

Merge branch 't/autogen'
---

c0dca63e02352cae6a8c241dba4bc0d2c7cde050
diff --cc NEWS
index 3443ebb3,e8f847b9..c08197f5
--- a/NEWS
+++ b/NEWS
@@@ -3,7 -3,6 +3,9 @@@
  -------------------------------------------
  
  	- configure: improved options for ogg/vorbis/speex.
 +	- The git version reported by --version always matches HEAD.
++	- The autogen script detects the number of processors and
++	  runs a parallel make if possible.
  
  ------------------------------------------
  0.4.6 (2011-03-31) "deterministic entropy"