diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
commit | cc29364f06178f8f6b457384f2ec37a042bd9d43 (patch) | |
tree | 7c77a3184c698bbf9d98cef09fb1ba8124daceba /kmail/kmmainwin.rc | |
parent | 4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff) | |
download | tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip |
* 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
Diffstat (limited to 'kmail/kmmainwin.rc')
-rw-r--r-- | kmail/kmmainwin.rc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kmail/kmmainwin.rc b/kmail/kmmainwin.rc index 07b9f6c5b..955dabad2 100644 --- a/kmail/kmmainwin.rc +++ b/kmail/kmmainwin.rc @@ -2,7 +2,7 @@ the same menu entries at the same place in KMail and Kontact --> <!DOCTYPE kpartgui> -<kpartgui version="100" name="kmmainwin" > +<kpartgui version="102" name="kmmainwin" > <MenuBar> <Menu noMerge="1" name="file" > <text>&File</text> @@ -103,6 +103,7 @@ <Action name="troubleshoot_folder" /> <Separator/> <Action name="empty" /> + <Action name="archive_folder" /> <Action name="delete_folder" /> <Separator/> <Action name="prefer_html" /> |