Tomas Frydrych 3b3226b678 Merge branch 'plugin-gobject' into next-generation
Conflicts:

	src/compositor/mutter/compositor-mutter.c
	src/core/window.c
2008-12-18 12:41:56 +00:00
..
2008-11-23 20:05:13 +00:00
2008-12-02 17:58:07 -05:00
2008-12-17 09:33:56 +00:00
2008-11-20 12:41:28 +00:00