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

Merge branch 't/uptime_cleanup'
---

c5670af5c1f784fe6c3d46d0281f2ba7c47af75e
diff --cc NEWS
index 75a62863,50f9b699..6db72253
--- a/NEWS
+++ b/NEWS
@@@ -2,14 -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.
- 
++	- cleanup of the internal uptime API.
 +
  --------------------------------------
  0.4.8 (2011-08-19) "nested assignment"
  --------------------------------------