aboutsummaryrefslogtreecommitdiffstats
path: root/src/song_sticker.h
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-10-06 22:45:02 +0200
committerMax Kellermann <max@duempel.org>2011-10-06 22:45:02 +0200
commit5c0576ca5519d525c6c383cd138da917b67a2810 (patch)
tree08a6f4b78ec2769265bb210e408a46b36f78be61 /src/song_sticker.h
parent4e909f94113360933b77cf9e67ec54649d48665f (diff)
parent039b3544902fe479fa2ce31f06de2c08377e0fc5 (diff)
downloadmpd-5c0576ca5519d525c6c383cd138da917b67a2810.tar.gz
mpd-5c0576ca5519d525c6c383cd138da917b67a2810.tar.xz
mpd-5c0576ca5519d525c6c383cd138da917b67a2810.zip
Merge branch 'v0.16.x'
Conflicts: configure.ac src/player_control.c src/player_thread.c src/playlist_song.c
Diffstat (limited to 'src/song_sticker.h')
0 files changed, 0 insertions, 0 deletions