Commit graph

2 commits

Author SHA1 Message Date
Tim-Philipp Müller 4b0dce5148 Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
	gst-libs/gst/audio/Makefile.am
	gst-libs/gst/audio/audio.h
	tests/examples/seek/jsseek.c
	tests/examples/seek/seek.c
	tests/icles/test-colorkey.c
2011-11-13 13:36:29 +00:00
Tim-Philipp Müller 789e325678 tests: update for GstXOverlay => GstVideoOverlay 2011-08-08 14:12:15 +01:00
Renamed from tests/icles/test-xoverlay.c (Browse further)