From: Andre Noll <maan@systemlinux.org>
Date: Sat, 6 Aug 2011 12:32:30 +0000 (+0200)
Subject: Merge branch 't/osx_overhaul'
X-Git-Tag: v0.4.8~22
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=8a61aff04fa2e8860f7fd3969d58d77c0292155a;p=paraslash.git

Merge branch 't/osx_overhaul'
---

8a61aff04fa2e8860f7fd3969d58d77c0292155a
diff --cc NEWS
index c6c2e4db,57ef197b..5105798f
--- a/NEWS
+++ b/NEWS
@@@ -6,7 -6,6 +6,8 @@@
  	  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.
 +	- Compiles cleanly also with llvm/clang.
++	- Rewrite of the osx writer (output plugin for Mac OS).
  
  --------------------------------------
  0.4.7 (2011-06-01) "infinite rollback"