Tim-Philipp Müller bb18ca7fa4 Merge remote-tracking branch 'origin/master' into 0.11 ... Conflicts: tools/gst-inspect.c		2011-11-13 13:23:09 +00:00
..
.gitignore	moap ignore	2006-07-02 22:20:20 +00:00
audio-example.c	controller: merge controller into gstobject	2011-11-10 22:47:07 +02:00
Makefile.am	Android: build audio controller example	2011-11-09 09:49:20 -03:00