diff options
author | Max Kellermann <max@duempel.org> | 2010-07-20 23:03:06 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2010-07-20 23:03:06 +0200 |
commit | c0da938d4f9e6b15cc5cca80090a15aa89ff3d2b (patch) | |
tree | ad9b4d900e4aa34b2c587423911c19f7d84cdde8 /src/daemon.c | |
parent | fb19aa355e566898fcb18bf3a5700a8e5f236696 (diff) | |
parent | 0fec8e08641470fdcaeb68fc362f77ca78925011 (diff) | |
download | mpd-c0da938d4f9e6b15cc5cca80090a15aa89ff3d2b.tar.gz mpd-c0da938d4f9e6b15cc5cca80090a15aa89ff3d2b.tar.xz mpd-c0da938d4f9e6b15cc5cca80090a15aa89ff3d2b.zip |
Merge release 0.15.12 from branch 'v0.15.x'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'src/daemon.c')
0 files changed, 0 insertions, 0 deletions