From: Andre Noll <maan@systemlinux.org>
Date: Wed, 16 Nov 2011 10:28:33 +0000 (+0100)
Subject: Merge branch 't/makefile_cleanups'
X-Git-Tag: v0.4.9~6
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=3150a0caa27a34d44556fb77f4a5aebc3d978580;p=paraslash.git

Merge branch 't/makefile_cleanups'
---

3150a0caa27a34d44556fb77f4a5aebc3d978580
diff --cc NEWS
index a79cc29f,6db72253..20ae7840
--- a/NEWS
+++ b/NEWS
@@@ -9,12 -9,6 +9,13 @@@
  	- Shared memory areas are no longer restricted to 64K. We now
  	  detect the maximal size of a shared memory area at runtime.
  	- 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.
++	- Makefile cleanups.
  
  --------------------------------------
  0.4.8 (2011-08-19) "nested assignment"