Vivian Meazza f6261f9328 Merge branch 'integration' into Work ... Conflicts: gui/menubar.xml Merge Willies and Torsten's menu Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>		2010-09-18 14:28:14 +01:00
..
dialogs	Merge branch 'integration' into Work	2010-09-18 14:28:14 +01:00
styles	define baseline height	2009-01-31 12:46:49 +00:00
menubar.xml	Merge branch 'integration' into Work	2010-09-18 14:28:14 +01:00
menubar.xml.alt	Local Weather v0.85 by Thorsten Renk	2010-09-10 08:52:21 +02:00