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
..
.gitignore	examples: Add a silly joystick based shuttle example	2010-03-30 21:56:03 +11:00
jsseek.c	Merge remote-tracking branch 'origin/master' into 0.11	2011-11-13 13:36:29 +00: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 remote-tracking branch 'origin/master' into 0.11	2011-11-13 13:36:29 +00: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