aboutsummaryrefslogtreecommitdiffstats
path: root/src/playlist_list.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2012-04-05 00:45:39 +0200
committerMax Kellermann <max@duempel.org>2012-04-05 00:45:39 +0200
commitc22cbbf8280bb35c8fee5ae3931d3bc08b70099f (patch)
tree4654b9834f51c32746e2f72ce64191149647d87e /src/playlist_list.c
parentf930f37d35995f0fc07f70aefc41babc0db1757e (diff)
parent5acee73fc85e44179120a5818247fc0760038cff (diff)
downloadmpd-c22cbbf8280bb35c8fee5ae3931d3bc08b70099f.tar.gz
mpd-c22cbbf8280bb35c8fee5ae3931d3bc08b70099f.tar.xz
mpd-c22cbbf8280bb35c8fee5ae3931d3bc08b70099f.zip
Merge branch 'v0.16.x'
Conflicts: src/output/osx_plugin.c src/text_input_stream.c
Diffstat (limited to 'src/playlist_list.c')
0 files changed, 0 insertions, 0 deletions