From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sun, 22 Feb 2009 14:09:22 +0000 (+0000)
Subject: Merge Core Audio fixes
X-Git-Tag: 5.0~187
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/e3002eb9f618d7498f21933a2e8552d42ffcc7fc?hp=-c

Merge Core Audio fixes
---

e3002eb9f618d7498f21933a2e8552d42ffcc7fc
diff --combined lib/Makefile.am
index af4f8a6,b270e82..9df1dfd
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -39,6 -39,7 +39,7 @@@ libdisorder_a_SOURCES=charset.c charset
  	client-common.c client-common.h			\
  	configuration.c configuration.h			\
  	cookies.c cookies.h				\
+ 	coreaudio.c coreaudio.h				\
  	dateparse.c dateparse.h xgetdate.c		\
  	defs.c defs.h					\
  	eclient.c eclient.h				\
@@@ -54,10 -55,10 +55,10 @@@
  	ifreq.c ifreq.h					\
  	inputline.c inputline.h				\
  	kvp.c kvp.h					\
 -	log.c log.h log-impl.h				\
 +	log.c log.h					\
  	logfd.c logfd.h					\
  	macros.c macros-builtin.c macros.h		\
 -	mem.c mem.h mem-impl.h				\
 +	mem.c mem.h 					\
  	mime.h mime.c					\
  	mixer.c mixer.h mixer-oss.c mixer-alsa.c	\
  	printf.c printf.h				\