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

move

2005-11-30 18:28:53 +00:00

.gitignore

maintenance commits

2005-09-05 13:18:42 +00:00

Makefile.am

docs: Bump common. Use upload-doc.mak instead of upload.mak

2009-06-11 13:32:22 +01:00

version.entities.in

commit new stuff

2005-08-30 19:20:02 +00:00