aboutsummaryrefslogtreecommitdiffstats
path: root/src/input
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-09-10 23:18:43 +0200
committerMax Kellermann <max@duempel.org>2009-09-10 23:18:43 +0200
commitfdc479676f7f39d33287111900f0862ddb7797af (patch)
tree9b77638e323b14e8b5cba3fd002ac2d7c580e06a /src/input
parent4cdf62000c2d5403f0dc5a5078719c2d63d268c7 (diff)
parent985b8b2d7159a47d1dd1d3604d6b8f6edc94d2e7 (diff)
downloadmpd-fdc479676f7f39d33287111900f0862ddb7797af.tar.gz
mpd-fdc479676f7f39d33287111900f0862ddb7797af.tar.xz
mpd-fdc479676f7f39d33287111900f0862ddb7797af.zip
Merge branch 'v0.15.x'
Conflicts: NEWS configure.ac doc/mpdconf.example
Diffstat (limited to 'src/input')
0 files changed, 0 insertions, 0 deletions