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

Merge branch 't/sched_improvements'
---

d49cd9a91015766cb19d7d43bb04048265925fe5
diff --cc NEWS
index a9572d7b,c6c2e4db..f76a6e97
--- a/NEWS
+++ b/NEWS
@@@ -17,7 -7,6 +17,8 @@@ 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.
  
  --------------------------------------
  0.4.7 (2011-06-01) "infinite rollback"