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 /kontact/src/kontactui.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 'kontact/src/kontactui.rc')
| -rw-r--r-- | kontact/src/kontactui.rc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kontact/src/kontactui.rc b/kontact/src/kontactui.rc index 8c68f0607..bd846c78c 100644 --- a/kontact/src/kontactui.rc +++ b/kontact/src/kontactui.rc @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE gui SYSTEM "kpartgui.dtd"> -<gui version="22" name="kontact" > +<gui version="23" name="kontact" > <MenuBar> <Menu name="file" noMerge="1"> <text>&File</text> @@ -31,15 +31,12 @@ <Menu name="help"><text>&Help</text> <Action name="help_introduction"/> <Action name="help_tipofday"/> - <Separator/> - <Action name="help_requestfeature"/> </Menu> </MenuBar> <ToolBar position="Top" noMerge="1" name="mainToolBar"><text>Main Toolbar</text> <Action name="action_new"/> <Action name="action_sync"/> <Merge/> - <Action name="help_whats_this"/> </ToolBar> <ToolBar position="Top" hidden="true" name="navigatorToolBar"><text>Navigator</text> <Action name="navigator_spacer_item"/> |