Sebastian Dröge 32bb92f2fa Merge branch 'master' into 0.11 ... Conflicts: tests/examples/Makefile.am tests/examples/playback/playback-test.c		2012-03-02 12:07:22 +01:00
..
Makefile.am	playback: Rename file from seek.c to playback-test.c	2012-03-02 11:58:30 +01:00
playback-test.c	Merge branch 'master' into 0.11	2012-03-02 12:07:22 +01:00