Max Kellermann 0ea4c970d7 Merge branch 'v0.16.x'
Conflicts:
	src/player_thread.c
	src/playlist_control.c
2011-07-20 21:46:05 +02:00
..
2011-01-29 10:13:54 +01:00
2011-01-29 10:13:54 +01:00
2011-01-29 10:13:54 +01:00
2011-01-29 10:13:54 +01:00
2011-01-29 10:13:54 +01:00
2011-07-19 00:24:20 +02:00
2011-01-29 10:13:54 +01:00
2011-04-12 08:11:33 +02:00
2011-07-19 00:24:20 +02:00
2011-07-19 00:24:20 +02:00
2011-01-29 10:13:54 +01:00
2011-01-29 10:13:54 +01:00
2011-01-29 10:13:54 +01:00
2011-01-29 10:13:54 +01:00
2011-01-29 10:13:54 +01:00
2011-01-29 10:13:54 +01:00
2011-01-29 10:13:54 +01:00
2011-01-29 10:13:54 +01:00
2011-01-29 10:13:54 +01:00
2011-01-29 10:13:54 +01:00
2011-01-29 10:13:54 +01:00
2011-01-29 10:13:54 +01:00
2011-01-29 10:13:54 +01:00
2011-01-29 10:13:54 +01:00