diff options
| author | Max Kellermann <max@duempel.org> | 2011-09-22 00:27:34 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-09-22 00:27:34 +0200 |
| commit | 7e219c362cf8bca80f60a79b77d95a228ff8ffcb (patch) | |
| tree | d2c44d848c59f074bd1f78dc94732404326d711e /Makefile.am | |
| parent | 203f48d1fd490fa136df36b96d75d279e3c17047 (diff) | |
| parent | 525a791987c66ed2f8b1ca9e5357836f536fdb8b (diff) | |
| download | mpd-7e219c362cf8bca80f60a79b77d95a228ff8ffcb.tar.gz mpd-7e219c362cf8bca80f60a79b77d95a228ff8ffcb.tar.xz mpd-7e219c362cf8bca80f60a79b77d95a228ff8ffcb.zip | |
Merge branch 'v0.16.x'
Conflicts:
src/player_thread.c
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions