From: Andre Noll <maan@systemlinux.org>
Date: Sun, 20 Nov 2011 14:05:15 +0000 (+0100)
Subject: Merge branch 't/recv_improvements'
X-Git-Tag: v0.4.9~4
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=3b447b02e2d74d596ecf6f5f764bf847653d407c;p=paraslash.git

Merge branch 't/recv_improvements'
---

3b447b02e2d74d596ecf6f5f764bf847653d407c
diff --cc NEWS
index 20ae7840,3a702729..d4a58fd1
--- a/NEWS
+++ b/NEWS
@@@ -11,11 -11,6 +11,12 @@@
  	- cleanup of the internal uptime API.
  	- para_server prefaults the mmapped audio file to avoid
  	  delays on slow media.
 +	- A new test for the test-suite that exercises the
 +	  communication between para_server and para_audiod.
 +	- The alsa writer eats up less CPU cycles when configured to
 +	  use the DMIX plugin.
++	- Simplified and unified receiver code.
 +	- Makefile cleanups.
  
  --------------------------------------
  0.4.8 (2011-08-19) "nested assignment"