Max Kellermann 4eb57e1e9a 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

2012-06-12 23:22:03 +02:00

38 KiB

Raw Blame History

View Raw