aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2010-07-19 23:49:15 +0200
committerMax Kellermann <max@duempel.org>2010-07-19 23:49:15 +0200
commit2bc5161e95e1e33445d6b7abf52c9d11bf631d33 (patch)
tree8ea72c55d25b6b1191f999e700bac3853441a67c /src
parente2e8d0d2f35e7ea4d9bc20d92f624bc957fd8060 (diff)
parent56bf4ede1896708c50df864521bd71aebf25aa02 (diff)
downloadmpd-2bc5161e95e1e33445d6b7abf52c9d11bf631d33.tar.gz
mpd-2bc5161e95e1e33445d6b7abf52c9d11bf631d33.tar.xz
mpd-2bc5161e95e1e33445d6b7abf52c9d11bf631d33.zip
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
Diffstat (limited to '')
-rw-r--r--src/playlist_control.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/playlist_control.c b/src/playlist_control.c
index fa843c89e..ce9bc8442 100644
--- a/src/playlist_control.c
+++ b/src/playlist_control.c
@@ -25,6 +25,7 @@
#include "config.h"
#include "playlist_internal.h"
#include "player_control.h"
+#include "idle.h"
#include <glib.h>