aboutsummaryrefslogtreecommitdiffstats
path: root/COPYING
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-04-12 07:39:01 +0200
committerMax Kellermann <max@duempel.org>2011-04-12 07:39:01 +0200
commitdef2fe8805d575c4be403f1c28aac70d87759d55 (patch)
treec649067a4984b1ef20daf7e8f2f813d5342046d2 /COPYING
parentf680b0a431b35fa5a005fec27899d4b18f664f3c (diff)
parentd4b00ff11cf102d8982ef342371acfa16ed2e515 (diff)
downloadmpd-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 'COPYING')
0 files changed, 0 insertions, 0 deletions