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
..
flac_encoder.c	fix common misspellings	2011-03-31 21:46:01 +02:00
lame_encoder.c	copyright year 2011	2011-01-29 10:13:54 +01:00
null_encoder.c	copyright year 2011	2011-01-29 10:13:54 +01:00
twolame_encoder.c	copyright year 2011	2011-01-29 10:13:54 +01:00
vorbis_encoder.c	Merge branch 'v0.16.x'	2011-07-20 21:46:05 +02:00
wave_encoder.c	Merge commit 'release-0.16.2'	2011-03-19 09:58:07 +01:00