aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/ChangeLog4
-rw-r--r--ui/evolution.xml1
2 files changed, 4 insertions, 1 deletions
diff --git a/ui/ChangeLog b/ui/ChangeLog
index a3848e9c38..a76d11d484 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-20 JP Rosevear <jpr@ximian.com>
+
+ * evolution.xml: remove conduit settings as a separate entry
+
2003-02-28 Ettore Perazzoli <ettore@ximian.com>
* evolution-mail-message.xml: Make "MessageReplyList" and
diff --git a/ui/evolution.xml b/ui/evolution.xml
index 4cf167caf6..7f37352ed5 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -171,7 +171,6 @@
<separator/>
<placeholder name="ComponentPlaceholder"/>
<menuitem name="PilotSettings" verb="" _label="Pi_lot Settings..." _tip="Set up Pilot configuration"/>
- <menuitem name="PilotConduitSettings" verb="" _label="Pilot Con_duit Settings..." _tip="Set up Pilot conduit configuration"/>
</submenu>
<placeholder name="SearchPlaceholder">