From: Andre Noll <maan@systemlinux.org>
Date: Sat, 19 Dec 2009 12:15:39 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.1~5^2~16
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=f113a41a633c0541f0d8418baf40205f4553c885;p=paraslash.git

Merge branch 'maint'

Conflicts:
	osx_write.c
---

f113a41a633c0541f0d8418baf40205f4553c885
diff --cc osx_write.c
index bc11e61a,c4042889..97a7ccf4
--- a/osx_write.c
+++ b/osx_write.c
@@@ -11,10 -11,8 +11,9 @@@
   * <skortze@sourceforge.net>
   */
  
 +#include <regex.h>
  #include <sys/types.h>
  #include <dirent.h>
- #include <CoreAudio/CoreAudio.h>
  
  #include "para.h"
  #include "fd.h"