Wim Taymans 016d036137 Merge branch 'master' into 0.11 ... Conflicts: configure.ac gst-libs/gst/audio/gstbaseaudiosink.c gst/audioconvert/channelmixtest.c gst/playback/gstplaybasebin.c gst/playback/gstsubtitleoverlay.c tests/examples/Makefile.am tests/examples/audio/Makefile.am		2011-10-27 15:44:58 +02:00
..
.gitignore	volume: move volume example to audio	2011-10-27 09:51:46 +02:00
audiomix.c	audiomix: add a simple audiomix example	2011-10-27 09:35:06 +02:00
Makefile.am	Merge branch 'master' into 0.11	2011-10-27 15:44:58 +02:00
testchannels.c	audio: move testchannels example to 'tests/examples' dir	2011-05-27 15:09:25 +03:00
volume.c	volume: move volume example to audio	2011-10-27 09:51:46 +02:00