From: Andre Noll <maan@systemlinux.org>
Date: Tue, 4 Oct 2011 19:41:47 +0000 (+0200)
Subject: Merge branch 't/shmmax'
X-Git-Tag: v0.4.9~21
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=4a0c8e1fb760134609dcf2c06cd1b9b76953d606

Merge branch 't/shmmax'
---

4a0c8e1fb760134609dcf2c06cd1b9b76953d606
diff --cc NEWS
index 50f9b699,50f9b699..75a62863
--- a/NEWS
+++ b/NEWS
@@@ -2,6 -2,6 +2,14 @@@
  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.
++
++
  --------------------------------------
  0.4.8 (2011-08-19) "nested assignment"
  --------------------------------------