From: Andre Noll <maan@systemlinux.org>
Date: Mon, 13 Jun 2011 12:16:17 +0000 (+0200)
Subject: Merge branch 't/audiod_regex'
X-Git-Tag: v0.4.8~32
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=a131c601951d62935b3d4cb51eae7405c3e8197a;p=paraslash.git

Merge branch 't/audiod_regex'
---

a131c601951d62935b3d4cb51eae7405c3e8197a
diff --cc NEWS
index da1398db,da1398db..57ef197b
--- a/NEWS
+++ b/NEWS
@@@ -2,6 -2,6 +2,11 @@@
  0.4.8 (to be announced) "nested assignment"
  -------------------------------------------
  
++	- audiod: The format specifier for receivers, filters and
++	  writers is now treated as a regular expression. This allows
++	  to replace 5 lines in the config file (one for each audio
++	  format) by one single line. See the manual for details.
++
  --------------------------------------
  0.4.7 (2011-06-01) "infinite rollback"
  --------------------------------------