From 7f16d2877b909190f903e4e5d3a47ad0edd92213 Mon Sep 17 00:00:00 2001
From: Vivian Meazza <vivian.meazza@lineone.net>
Date: Sat, 18 Sep 2010 13:24:58 +0100
Subject: [PATCH] Merge Willie's menu with Torsten's

Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
---
 gui/menubar.xml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/gui/menubar.xml b/gui/menubar.xml
index 0d711cf23..8dbbc8918 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -299,7 +299,7 @@
 	<menu>
 		<label>Environment</label>
 
-		<item>
+		<!--<item>
 			<label>Weather Scenario</label>
 			<binding>
 				<command>dialog-show</command>
@@ -313,7 +313,7 @@
 				<command>dialog-show</command>
 				<dialog-name>weather</dialog-name>
 			</binding>
-		</item>
+		</item>-->
 
 		<item>
 			<label>Global Weather</label>
@@ -339,14 +339,6 @@
 			</binding>
 		</item>
 
-		<item>
-			<label>Local Weather Tiles</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>local_weather_tiles</dialog-name>
-			</binding>
-		</item>
-
 
 		<item>
 			<label>Wildfire Settings</label>