projects
/
paraslash.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c553c9e
4f84d0d
)
Merge branch 'maint'
author
Andre Noll
<maan@systemlinux.org>
Thu, 10 Dec 2009 13:50:03 +0000
(14:50 +0100)
committer
Andre Noll
<maan@systemlinux.org>
Thu, 10 Dec 2009 13:50:03 +0000
(14:50 +0100)
Conflicts:
osx_write.c
1
2
osx_write.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
osx_write.c
index bc11e61aea24a22596c88a3e4e14f5d7b9ad746c,c40428895ece1e8376cd6e58b83a2369eba53fa4..97a7ccf49ba74977718e335f15142306e11c2c91
---
1
/
osx_write.c
---
2
/
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"