Merge branch 'v0.15.x' into v0.16.x

Conflicts:
	NEWS
	configure.ac
	src/directory.h
This commit is contained in:
Max Kellermann
2011-01-07 23:50:23 +01:00
6 changed files with 25 additions and 10 deletions

5
NEWS
View File

@@ -127,6 +127,11 @@ ver 0.16 (2010/12/11)
* make single mode 'sticky'
ver 0.15.16 (2010/??/??)
* encoders:
- lame: explicitly configure the output sample rate
ver 0.15.15 (2010/11/08)
* input:
- rewind: fix assertion failure