diff options
| author | Max Kellermann <max@duempel.org> | 2010-07-19 23:49:15 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2010-07-19 23:49:15 +0200 |
| commit | 2bc5161e95e1e33445d6b7abf52c9d11bf631d33 (patch) | |
| tree | 8ea72c55d25b6b1191f999e700bac3853441a67c /src/pcm_mix.c | |
| parent | e2e8d0d2f35e7ea4d9bc20d92f624bc957fd8060 (diff) | |
| parent | 56bf4ede1896708c50df864521bd71aebf25aa02 (diff) | |
| download | mpd-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 '')
0 files changed, 0 insertions, 0 deletions