aboutsummaryrefslogtreecommitdiffstats
path: root/src/conf.h
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-12-21 19:39:08 +0100
committerMax Kellermann <max@duempel.org>2008-12-21 19:39:08 +0100
commitbc31d7a0ee0a999cdb2d21fb8f0c64ac0a263263 (patch)
tree4fe1de8f00a14274b9146d48a4addb18b49acf1b /src/conf.h
parenta6e981c08d8f37e86bb6040d23486fd18b05d111 (diff)
parent143b46caf527ca8e53c186db751930ad1d343b4d (diff)
downloadmpd-bc31d7a0ee0a999cdb2d21fb8f0c64ac0a263263.tar.gz
mpd-bc31d7a0ee0a999cdb2d21fb8f0c64ac0a263263.tar.xz
mpd-bc31d7a0ee0a999cdb2d21fb8f0c64ac0a263263.zip
Merge branch 'master' of git://git.musicpd.org/avuton/mpd
Conflicts: doc/mpdconf.example
Diffstat (limited to 'src/conf.h')
0 files changed, 0 insertions, 0 deletions