Wim Taymans cc65bff7c1 Merge branch 'master' into 0.11 ... Conflicts: configure.ac docs/plugins/inspect/plugin-esdsink.xml docs/plugins/inspect/plugin-gconfelements.xml		2011-06-21 18:24:41 +02:00
..
plugins	Merge branch 'master' into 0.11	2011-06-21 18:24:41 +02:00
random
.gitignore
Makefile.am
version.entities.in