Edward Hervey 4917e16458 Merge remote-tracking branch 'origin/master' into 0.11 ... Conflicts: tests/examples/camerabin2/Makefile.am		2011-12-30 11:49:27 +01:00
..
.gitignore	camerabin2: examples: Add gst-camerabin2-test	2011-03-10 08:42:00 -03:00
gst-camera2.c	Merge remote-tracking branch 'origin/master' into 0.11	2011-12-30 11:49:27 +01:00
gst-camera2.h	examples: camerabin2: add format selection for camerabin2 example	2011-12-29 12:47:48 -03:00
gst-camera2.ui	examples: camerabin2: add format selection for camerabin2 example	2011-12-29 12:47:48 -03:00
gst-camerabin2-test.c	fix for moved interfaces	2011-11-29 19:11:22 +01:00
Makefile.am	Merge remote-tracking branch 'origin/master' into 0.11	2011-12-30 11:49:27 +01:00