From: Andre Noll <maan@systemlinux.org>
Date: Mon, 24 Oct 2011 13:31:31 +0000 (+0200)
Subject: Merge branch 't/map_populate'
X-Git-Tag: v0.4.9~15
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=a5ad3d4c598bafe28e90e5b623e0a754d6e973d5;p=paraslash.git

Merge branch 't/map_populate'
---

a5ad3d4c598bafe28e90e5b623e0a754d6e973d5
diff --cc NEWS
index 6db72253,50f9b699..3a702729
--- a/NEWS
+++ b/NEWS
@@@ -2,14 -2,6 +2,16 @@@
  0.4.9 (to be announced) "hybrid causality"
  ------------------------------------------
  
 +	- Fix for an endless loop in the mp3 decoder for certain
 +	  (corrupt) mp3 files.
 +	- autogen.sh now detects a distcc setup and adjusts the
 +	  parameter for the -j option of make accordingly.
 +	- 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.
 +
  --------------------------------------
  0.4.8 (2011-08-19) "nested assignment"
  --------------------------------------