diff options
| author | Max Kellermann <max@duempel.org> | 2009-10-31 18:23:56 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-10-31 18:23:56 +0100 |
| commit | 806496dfc937d9b55e00672d42928a25cfa67c90 (patch) | |
| tree | 1a340ce9afe9fa763c83943e7f68cc5b8f3ec750 /src/encoder/twolame_encoder.c | |
| parent | 9eadb517da965b01929bdb7ce5c8f2911a9363db (diff) | |
| parent | 3de912e2b956821782bd77acc6e12f66086c1926 (diff) | |
| download | mpd-806496dfc937d9b55e00672d42928a25cfa67c90.tar.gz mpd-806496dfc937d9b55e00672d42928a25cfa67c90.tar.xz mpd-806496dfc937d9b55e00672d42928a25cfa67c90.zip | |
Merge branch 'v0.15.x'
Conflicts:
NEWS
configure.ac
src/decoder/ffmpeg_plugin.c
src/update.c
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions