Merge remote-tracking branch 'origin/0.10'

Browse source

Conflicts:
	docs/gst/gstreamer-sections.txt
	gst/Makefile.am
	gst/gst.c
	gst/gst.h
	gst/gstevent.c
	gst/gstevent.h
	gst/gstmessage.c
	gst/gstmessage.h
	gst/gstquark.c
	gst/gstquark.h
	gst/gstquery.c
	gst/gstquery.h
	gst/gsttoc.c
	gst/gsttoc.h
	gst/gsttocsetter.c
	tests/check/Makefile.am
	tests/check/gst/gsttoc.c
	tests/check/gst/gsttocsetter.c

...

This commit is contained in:

Sebastian Dröge 2012-04-04 12:25:40 +02:00

parent b15bcb66b4 4d79cbe7ef

commit 6a0e594ebc

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available