Merge commit 'release-0.16.2'

Conflicts: Makefile.am NEWS configure.ac
2011-03-19 09:58:07 +01:00
parent 1a954748a0 fe588a255b
commit 0c9fc2f809
24 changed files with 128 additions and 43 deletions
--- a/src/decoder/audiofile_decoder_plugin.c
+++ b/src/decoder/audiofile_decoder_plugin.c
@@ -244,7 +244,7 @@ static const char *const audiofile_suffixes[] = {
 static const char *const audiofile_mime_types[] = {
 	"audio/x-wav",
 	"audio/x-aiff",
-	NULL 
+	NULL
 };

 const struct decoder_plugin audiofile_decoder_plugin = {