diff options
author | Max Kellermann <max@duempel.org> | 2011-01-10 11:47:14 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2011-01-10 11:47:14 +0100 |
commit | 2b29ca796edfc765b498463dac732663142911f2 (patch) | |
tree | bb71702b20181e5f96bf64c95facc164deb19736 /src/song_sticker.h | |
parent | 51840088128a25a642744db3a2bff380952ca375 (diff) | |
parent | 9ad862d3a6f0cbb043bf4f9ff97e54e5c606ad3e (diff) | |
download | mpd-2b29ca796edfc765b498463dac732663142911f2.tar.gz mpd-2b29ca796edfc765b498463dac732663142911f2.tar.xz mpd-2b29ca796edfc765b498463dac732663142911f2.zip |
Merge commit 'release-0.16.1'
Conflicts:
NEWS
Diffstat (limited to 'src/song_sticker.h')
0 files changed, 0 insertions, 0 deletions