diff options
| author | Max Kellermann <max@duempel.org> | 2012-06-12 23:22:03 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-06-12 23:22:03 +0200 |
| commit | 4eb57e1e9a1718ce93eced6bd4fb06d8abb26477 (patch) | |
| tree | 2355c6d77273cf614822f5a144005ab1d353863b /src/decoder | |
| parent | d662c4c0cc089a6a493a7463e440f0f7e7959b48 (diff) | |
| parent | 1d52e2cc7727d93e65d557c322b5dd7dc149651c (diff) | |
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
Diffstat (limited to 'src/decoder')
| -rw-r--r-- | src/decoder/wildmidi_decoder_plugin.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/decoder/wildmidi_decoder_plugin.c b/src/decoder/wildmidi_decoder_plugin.c index a2224940..2cdb30a9 100644 --- a/src/decoder/wildmidi_decoder_plugin.c +++ b/src/decoder/wildmidi_decoder_plugin.c @@ -20,6 +20,7 @@ #include "config.h" #include "decoder_api.h" #include "tag_handler.h" +#include "glib_compat.h" #include <glib.h> |