diff options
author | Max Kellermann <max@duempel.org> | 2012-08-13 07:59:19 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2012-08-13 07:59:19 +0200 |
commit | 3047bdf6531d6718239d1e2e0f201d0b8e54dba1 (patch) | |
tree | 033d49c9b6749c368e432eaaef644e80037f3f0f /m4/ucred.m4 | |
parent | a0478f98af3fb53168bdffa666894dde87cfe597 (diff) | |
parent | 12be9e818f01777283d49c8e37f618e4e9731371 (diff) | |
download | mpd-3047bdf6531d6718239d1e2e0f201d0b8e54dba1.tar.gz mpd-3047bdf6531d6718239d1e2e0f201d0b8e54dba1.tar.xz mpd-3047bdf6531d6718239d1e2e0f201d0b8e54dba1.zip |
Merge branch 'v0.17.x'
Conflicts:
NEWS
configure.ac
src/client_file.h
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions