Merge configuration fixes

author Richard Kettlewell <rjk@greenend.org.uk>

Sun, 8 Mar 2009 14:01:44 +0000 (14:01 +0000)

committer Richard Kettlewell <rjk@greenend.org.uk>

Sun, 8 Mar 2009 14:01:44 +0000 (14:01 +0000)
author Richard Kettlewell <rjk@greenend.org.uk>
Sun, 8 Mar 2009 14:01:44 +0000 (14:01 +0000)
committer Richard Kettlewell <rjk@greenend.org.uk>
Sun, 8 Mar 2009 14:01:44 +0000 (14:01 +0000)
diff --cc lib/uaudio-alsa.c
Simple merge
diff --cc lib/uaudio-oss.c
Simple merge
author	Richard Kettlewell <rjk@greenend.org.uk>
	Sun, 8 Mar 2009 14:01:44 +0000 (14:01 +0000)
committer	Richard Kettlewell <rjk@greenend.org.uk>
	Sun, 8 Mar 2009 14:01:44 +0000 (14:01 +0000)
		1	2
lib/uaudio-alsa.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/uaudio-oss.c	patch \|	diff1 \|	diff2 \|	blob \| history