diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-08-20 19:15:23 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-08-20 19:15:23 +0200 |
| commit | 52bf222bf033f6bbcd15cfe2012a51a194d475d8 (patch) | |
| tree | d2e839ccbdf38c930d145d4d8dd23897bbc43666 /src/rekonqui.rc | |
| parent | Krazy fixes, first bunch (diff) | |
| parent | - The bookmark toolbar is now a real toolbar, not an action. (diff) | |
| download | rekonq-52bf222bf033f6bbcd15cfe2012a51a194d475d8.tar.xz | |
Merge commit 'refs/merge-requests/181' of git://gitorious.org/rekonq/mainline into m181
Conflicts:
src/bookmarks/bookmarkstoolbar.h
Diffstat (limited to 'src/rekonqui.rc')
| -rw-r--r-- | src/rekonqui.rc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rekonqui.rc b/src/rekonqui.rc index e89e3b15..8b9a51cb 100644 --- a/src/rekonqui.rc +++ b/src/rekonqui.rc @@ -88,13 +88,13 @@ <Separator /> <Action name="stop_reload" /> <Action name="url_bar" /> + <Action name="bookmarksActionMenu" /> <Action name="rekonq_tools" /> </ToolBar> <!-- ============ Bookmarks ToolBar =========== --> -<ToolBar name="bookmarksToolBar" fullWidth="true" iconText="icontextright" iconSize="16" newline="true" hidden="true" noEdit="true"> - <text>Bookmark Toolbar</text> - <Action noEdit="true" name="bookmarks_bar" /> +<ToolBar noEdit="true" iconText="icontextright" fullWidth="true" name="bookmarkToolBar" iconSize="16" newline="true"> + <text>Bookmark Toolbar</text> </ToolBar> </gui> |