Tim-Philipp Müller 2d7f9cfe92 Merge remote-tracking branch 'origin/master' into 0.11 ... Conflicts: gst/gstbuffer.h gst/gstbufferlist.h gst/gstcaps.h gst/gstdatetime.h gst/gstelementfactory.h gst/gstevent.h gst/gstghostpad.h gst/gstindexfactory.h gst/gstiterator.h gst/gstmessage.h gst/gstminiobject.h gst/gstpipeline.h gst/gstquery.h gst/gstsegment.h gst/gststructure.h gst/gsttaglist.h gst/gsturi.h gst/gstvalue.h libs/gst/base/gstbitreader.h libs/gst/base/gstbytereader.h libs/gst/base/gstbytewriter.h Note: can't use G_GNUC_MALLOC with GstCaps return values in 0.11 because of the EMPTY+ANY singletons.		2011-11-26 19:44:23 +00:00
..
gst	Merge remote-tracking branch 'origin/master' into 0.11	2011-11-26 19:44:23 +00:00
Makefile.am	android: make it ready for androgenizer	2011-04-11 01:08:07 +02:00