diff options
| author | Max Kellermann <max@duempel.org> | 2011-09-15 21:48:33 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-09-15 21:48:33 +0200 |
| commit | f804a739b1c4dd96efe268a84d58bfe4750b3378 (patch) | |
| tree | 6abfb38026191f3b0c720a1ffea069769df1ec53 /src/encoder | |
| parent | 8751783a1b4fe8c61ac63b718be1df5f1d77d339 (diff) | |
| parent | 2ed870c8546ce4654f956beea60546260d98a85c (diff) | |
| download | mpd-f804a739b1c4dd96efe268a84d58bfe4750b3378.tar.gz mpd-f804a739b1c4dd96efe268a84d58bfe4750b3378.tar.xz mpd-f804a739b1c4dd96efe268a84d58bfe4750b3378.zip | |
Merge branch 'v0.16.x'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'src/encoder')
0 files changed, 0 insertions, 0 deletions