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
..
ext	move ffmpeg stuff to gst-ffmpeg module	2004-02-13 15:11:50 +00:00
gst	Merge remote-tracking branch 'origin/master' into 0.11	2011-11-13 13:36:29 +00:00
Makefile.am	configure.ac: added GST_LIB_LDFLAGS and GST_ALL_LDFLAGS	2005-11-27 16:18:50 +00:00