Merge release 0.15.11 from branch 'v0.15.x

Conflicts:
	NEWS
	configure.ac
	src/decoder/ffmpeg_decoder_plugin.c
	src/decoder/mikmod_decoder_plugin.c
	src/decoder/mp4ff_decoder_plugin.c
	src/decoder/vorbis_decoder_plugin.c
	src/directory_print.c
	src/playlist_control.c
	src/tag_ape.c
This commit is contained in:
Max Kellermann
2010-07-19 23:49:15 +02:00
2 changed files with 17 additions and 3 deletions

View File

@@ -25,6 +25,7 @@
#include "config.h"
#include "playlist_internal.h"
#include "player_control.h"
#include "idle.h"
#include <glib.h>