diff options
author | Max Kellermann <max@duempel.org> | 2009-10-18 19:02:43 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2009-10-18 19:02:43 +0200 |
commit | 447e4d3583d3394a25f0fb186f50cea45dd7f797 (patch) | |
tree | dfbafa9caaef9cc203cd6dde2b090d47d847ae1d /src/main.c | |
parent | 33bf6c09787033597588e96a6530d5c04b5eb166 (diff) | |
parent | 7df1a2c77d7f0ac2073d3fe9c7ff85dc4a28e12a (diff) | |
download | mpd-447e4d3583d3394a25f0fb186f50cea45dd7f797.tar.gz mpd-447e4d3583d3394a25f0fb186f50cea45dd7f797.tar.xz mpd-447e4d3583d3394a25f0fb186f50cea45dd7f797.zip |
Merged release 0.15.5 from branch 'v0.15.x'
Conflicts:
NEWS
configure.ac
src/decoder/flac_plugin.c
src/update.c
Diffstat (limited to 'src/main.c')
0 files changed, 0 insertions, 0 deletions