Tim-Philipp Müller 8580dd86c9 eqMerge remote-tracking branch 'origin/master' into 0.11 ...

Conflicts:
	ext/jack/gstjackaudiosink.c
	ext/jack/gstjackaudiosrc.c
	gst/matroska/matroska-mux.c
	gst/matroska/matroska-read-common.c
	gst/rtpmanager/gstrtpssrcdemux.c

2012-01-12 23:48:50 +00:00

..

check

eqMerge remote-tracking branch 'origin/master' into 0.11

2012-01-12 23:48:50 +00:00

examples

controller: port to API changes

2011-12-31 10:00:41 +01:00

files

tests: dist test file used in matroskaparse unit test

2011-12-11 17:24:11 +00:00

icles

Merge branch 'master' into 0.11

2012-01-10 14:32:32 +01:00

Makefile.am

tests: don't build examples if --disable-examples was passed to configure

2009-05-05 13:23:45 +01:00