diff options
| author | Max Kellermann <max@duempel.org> | 2011-04-12 08:11:33 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-04-12 08:11:33 +0200 |
| commit | c2ada39fd3037a0f6180326ecb5fa5913b719326 (patch) | |
| tree | 68c2f36831283553a5a2e12f2b4f3ad3dd91100f /src/main.c | |
| parent | 77b6e275008743fbd27f423d42d92f74518a5b28 (diff) | |
| parent | def2fe8805d575c4be403f1c28aac70d87759d55 (diff) | |
| download | mpd-c2ada39fd3037a0f6180326ecb5fa5913b719326.tar.gz mpd-c2ada39fd3037a0f6180326ecb5fa5913b719326.tar.xz mpd-c2ada39fd3037a0f6180326ecb5fa5913b719326.zip | |
Merge branch 'v0.16.x'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'src/main.c')
0 files changed, 0 insertions, 0 deletions