diff options
| author | Max Kellermann <max@duempel.org> | 2011-01-07 23:50:23 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-01-07 23:50:23 +0100 |
| commit | 8c0afd8557b1823e2df94c9f4de90c29eafbf035 (patch) | |
| tree | ec4d9131c4e1cb5e1a832e4b70712884f2406a81 /src/archive | |
| parent | 2a56300f7bad00860f5ff44dfea061386173a852 (diff) | |
| parent | 0022fb100b7d22b9612474ebee944e66c2a7b33b (diff) | |
| download | mpd-8c0afd8557b1823e2df94c9f4de90c29eafbf035.tar.gz mpd-8c0afd8557b1823e2df94c9f4de90c29eafbf035.tar.xz mpd-8c0afd8557b1823e2df94c9f4de90c29eafbf035.zip | |
Merge branch 'v0.15.x' into v0.16.x
Conflicts:
NEWS
configure.ac
src/directory.h
Diffstat (limited to 'src/archive')
0 files changed, 0 insertions, 0 deletions