Merge branch 'v0.16.x'

Conflicts:
	src/player_thread.c
This commit is contained in:
Max Kellermann
2011-09-22 00:27:34 +02:00
7 changed files with 81 additions and 18 deletions

View File

@@ -219,7 +219,7 @@ AC_ARG_ENABLE(raop-output,
AC_ARG_ENABLE(id3,
AS_HELP_STRING([--enable-id3],
[disable id3 support]),,
[enable id3 support]),,
enable_id3=auto)
AC_ARG_ENABLE(inotify,