Merge lp:~mefrio-g/pantheon-files/fix-1005543 into lp:~elementary-apps/pantheon-files/trunk

Proposed by Mario Guerriero
Status: Merged
Merged at revision: 830
Proposed branch: lp:~mefrio-g/pantheon-files/fix-1005543
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 13 lines (+2/-1)
1 file modified
src/pantheon-files-ui.xml (+2/-1)
To merge this branch: bzr merge lp:~mefrio-g/pantheon-files/fix-1005543
Reviewer Review Type Date Requested Status
Cody Garver (community) Approve
Review via email: mp+107631@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/pantheon-files-ui.xml'
2--- src/pantheon-files-ui.xml 2012-05-07 18:09:37 +0000
3+++ src/pantheon-files-ui.xml 2012-05-28 14:23:19 +0000
4@@ -154,7 +154,8 @@
5 <menuitem name="Reset to Defaults" action="Reset to Defaults"/>-->
6 <menuitem name="Show Hidden Files" action="Show Hidden Files"/>
7 <separator/>
8+ <menuitem name="MarlinSettings" action="MarlinSettings"/>
9+ <separator />
10 <menuitem name="About" action="About"/>
11- <menuitem name="MarlinSettings" action="MarlinSettings"/>
12 </popup>
13 </ui>

Subscribers

People subscribed via source and target branches

to all changes: