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
..
2011-11-28 13:30:27 +00:00
2011-11-28 13:30:27 +00:00
2012-01-10 14:32:32 +01:00
2012-01-10 14:32:32 +01:00
2012-01-10 14:32:32 +01:00
2011-11-28 13:30:27 +00:00
2011-11-28 13:30:27 +00:00
2011-11-28 13:30:27 +00:00
2012-01-10 14:32:32 +01:00
2011-11-28 13:30:27 +00:00
2012-01-11 14:10:46 +01:00
2011-11-28 13:30:27 +00:00
2012-01-10 14:32:32 +01:00
2011-08-03 10:59:56 +02:00