Merge branch 'v0.16.x'

Conflicts:
	src/cmdline.c
	src/decoder/wildmidi_decoder_plugin.c
	src/gcc.h
	src/glib_compat.h
	src/input_stream.c
	src/output_list.c
	src/output_thread.c
	valgrind.suppressions
This commit is contained in:
Max Kellermann
2012-06-12 23:22:03 +02:00
25 changed files with 239 additions and 175 deletions

View File

@@ -20,6 +20,7 @@
#include "config.h"
#include "decoder_api.h"
#include "tag_handler.h"
#include "glib_compat.h"
#include <glib.h>