From: Andre Noll <maan@systemlinux.org>
Date: Sun, 22 May 2011 13:22:42 +0000 (+0200)
Subject: Merge branch 't/decl_after_statement'
X-Git-Tag: v0.4.7~4
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=d91b2b2a70c85562b5d30cc5fda46468532e314a;p=paraslash.git

Merge branch 't/decl_after_statement'
---

d91b2b2a70c85562b5d30cc5fda46468532e314a
diff --cc NEWS
index bf6f2bab,bf6f2bab..c56fc719
--- a/NEWS
+++ b/NEWS
@@@ -2,6 -2,6 +2,9 @@@
  0.4.7 (to be announced) "infinite rollback"
  -------------------------------------------
  
++The new ao writer, support for ssh RSA keys and a couple of other
++enhancements.
++
  	- Support for ESD, Pulseaudio, AIX, Solaris, IRIX and other
  	  platforms through the libao audio library.
  	- Support for RSA keys generated with ssh-keygen.
@@@ -10,6 -10,6 +13,7 @@@
  	- The autogen script detects the number of processors and
  	  runs a parallel make if possible.
  	- Major cleanup of the crypto API.
++	- Documentation updates.
  
  ------------------------------------------
  0.4.6 (2011-03-31) "deterministic entropy"