Wim Taymans 3fab57b5cf Merge branch 'master' into 0.11 ... Conflicts: gst-libs/gst/interfaces/videooverlay.c gst-libs/gst/rtp/gstrtpbuffer.c po/af.po po/az.po po/bg.po po/ca.po po/cs.po po/da.po po/de.po po/el.po po/en_GB.po po/es.po po/eu.po po/fi.po po/fr.po po/gl.po po/hu.po po/id.po po/it.po po/ja.po po/lt.po po/lv.po po/nb.po po/nl.po po/or.po po/pl.po po/pt_BR.po po/ro.po po/ru.po po/sk.po po/sl.po po/sq.po po/sr.po po/sv.po po/tr.po po/uk.po po/vi.po po/zh_CN.po		2011-08-22 13:06:27 +02:00
..
design	Merge remote-tracking branch 'origin/master' into 0.11	2011-06-26 21:27:28 +01:00
libs	Merge branch 'master' into 0.11	2011-08-22 13:06:27 +02:00
plugins	ffmpegcolorspace -> videoconvert	2011-07-07 23:59:59 +01:00
random	ignore more	2005-11-30 17:45:21 +00:00
.gitignore	first stab at documenting elements	2005-08-05 17:13:10 +00:00
Makefile.am	make: move the design doc also on the Makefile.am level (for dist)	2010-12-13 12:36:47 +02:00
version.entities.in	Added boilerplate gtk-doc files for plugin-libs documentation.	2004-12-20 16:29:06 +00:00