diff options
author | Max Kellermann <max@duempel.org> | 2010-11-08 18:50:22 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2010-11-08 18:50:22 +0100 |
commit | f384f8da9303c48bcb932398905a3389c8d83295 (patch) | |
tree | a8a365f77fefc9f03a8f78ddc37437c812ae61ef /src/input/ffmpeg_input_plugin.c | |
parent | 5a3aa1262a471b842e95b2e6e1dcdfbce035b75c (diff) | |
parent | 23cd8a74bef28003514e1a3ce2b29126f96a0513 (diff) | |
download | mpd-f384f8da9303c48bcb932398905a3389c8d83295.tar.gz mpd-f384f8da9303c48bcb932398905a3389c8d83295.tar.xz mpd-f384f8da9303c48bcb932398905a3389c8d83295.zip |
Merge release 0.15.15 from branch 'v0.15.x'
Conflicts:
NEWS
configure.ac
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions