From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 1 Sep 2010 00:37:02 +0000
Subject: * Massive set of changes to bring in all fixes and enhancements from
 the Enterprise PIM branch * Ensured that the Trinity changes were applied on
 top of those enhancements, and any redundancy removed * Added journal read
 support to the CalDAV resource * Fixed CalDAV resource to use events URL for
 tasks and journals when separate URL checkbox unchecked

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kmail/kmail_part.rc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'kmail/kmail_part.rc')

diff --git a/kmail/kmail_part.rc b/kmail/kmail_part.rc
index 72cf6ec35..fb4794dfd 100644
--- a/kmail/kmail_part.rc
+++ b/kmail/kmail_part.rc
@@ -2,7 +2,7 @@
      the same menu entries at the same place in KMail and Kontact  -->
 
 <!DOCTYPE kpartgui>
-<kpartgui version="18" name="kmail_part" >
+<kpartgui version="20" name="kmail_part" >
  <MenuBar>
   <Menu noMerge="1" name="file" >
    <text>&amp;File</text>
@@ -100,6 +100,7 @@
    <Action name="troubleshoot_folder" />
    <Separator/>
    <Action name="empty" />
+   <Action name="archive_folder" />
    <Action name="delete_folder" />
    <Separator/>
    <Action name="prefer_html" />
-- 
cgit v1.2.1