diff options
| author | Max Kellermann <max@duempel.org> | 2011-04-12 07:39:01 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-04-12 07:39:01 +0200 |
| commit | def2fe8805d575c4be403f1c28aac70d87759d55 (patch) | |
| tree | c649067a4984b1ef20daf7e8f2f813d5342046d2 /src/cmdline.c | |
| parent | f680b0a431b35fa5a005fec27899d4b18f664f3c (diff) | |
| parent | d4b00ff11cf102d8982ef342371acfa16ed2e515 (diff) | |
| download | mpd-def2fe8805d575c4be403f1c28aac70d87759d55.tar.gz mpd-def2fe8805d575c4be403f1c28aac70d87759d55.tar.xz mpd-def2fe8805d575c4be403f1c28aac70d87759d55.zip | |
Merge branch 'v0.15.x' into v0.16.x
Conflicts:
NEWS
configure.ac
src/listen.c
Diffstat (limited to 'src/cmdline.c')
0 files changed, 0 insertions, 0 deletions