Wim Taymans d77c8cafee Merge branch 'master' into 0.11 ... Conflicts: common ext/pango/gsttextoverlay.c gst-libs/gst/video/video.c		2011-11-09 12:11:59 +01:00
..
.gitignore	examples: Add a silly joystick based shuttle example	2010-03-30 21:56:03 +11:00
jsseek.c	videooverlay: add convenience API to check if a message is a prepare-window-handle message	2011-08-08 14:41:17 +01:00
Makefile.am	examples: build silly joystick seek example only on linux	2010-04-04 12:15:04 +01:00
scrubby.c	tests: update for query API changes	2011-07-27 01:18:19 +01:00
seek.c	Merge branch 'master' into 0.11	2011-11-09 12:11:59 +01:00
stepping.c	examples: add stepping example.	2009-06-03 15:31:27 +02:00
stepping2.c	example: fix compile	2009-06-12 13:55:02 +02:00