From: Andre Noll <maan@systemlinux.org>
Date: Sat, 13 Aug 2011 10:17:51 +0000 (+0200)
Subject: Merge branch 't/timing_improvements'
X-Git-Tag: v0.4.8~10
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=5ff2b0b3a6f9242033c436fb8272245f5594dd8c;p=paraslash.git

Merge branch 't/timing_improvements'
---

5ff2b0b3a6f9242033c436fb8272245f5594dd8c
diff --cc NEWS
index f76a6e97,7d330ce4..49747ccb
--- a/NEWS
+++ b/NEWS
@@@ -17,8 -17,6 +17,9 @@@ are the highlights of this release
  	  to replace 5 lines in the config file (one for each audio
  	  format) by one single line. See the manual for details.
  	- Compiles cleanly also with llvm/clang.
 +	- Corrupt mp3 files are handled more gracefully.
 +	- sched: Optimized zero timeouts.
++	- vss timeout cleanups.
  
  --------------------------------------
  0.4.7 (2011-06-01) "infinite rollback"