diff options
| author | Max Kellermann <max@duempel.org> | 2011-03-16 18:08:54 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-03-16 18:08:54 +0100 |
| commit | 6dcec366214da4238819914985e4921e258ba324 (patch) | |
| tree | 5d13492cdd62fccd7e380b5511262c66a9fdb999 /src/sticker_print.h | |
| parent | e2aea6bce581e09e20f7570fd67cb92896f60656 (diff) | |
| parent | 4d4b7e3de076ed8cf4a4d1e780a43d777221a125 (diff) | |
| download | mpd-6dcec366214da4238819914985e4921e258ba324.tar.gz mpd-6dcec366214da4238819914985e4921e258ba324.tar.xz mpd-6dcec366214da4238819914985e4921e258ba324.zip | |
Merge release 0.15.16 into v0.16.x
Conflicts:
NEWS
configure.ac
src/output/jack_plugin.c
src/update.c
Diffstat (limited to 'src/sticker_print.h')
0 files changed, 0 insertions, 0 deletions