Merge lp:~codygarver/elementaryos/launcher-order into lp:~elementary-os/elementaryos/default-settings-luna

Proposed by Cody Garver on 2013-03-07
Status: Merged
Merged at revision: 86
Proposed branch: lp:~codygarver/elementaryos/launcher-order
Merge into: lp:~elementary-os/elementaryos/default-settings-luna
Diff against target: 19 lines (+2/-2)
1 file modified
plank/dock1/settings (+2/-2)
To merge this branch: bzr merge lp:~codygarver/elementaryos/launcher-order
Reviewer Review Type Date Requested Status
elementary OS team 2013-03-07 Pending
Review via email:
To post a comment you must log in.
87. By Cody Garver on 2013-03-07


Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plank/dock1/settings'
2--- plank/dock1/settings 2013-02-04 12:02:01 +0000
3+++ plank/dock1/settings 2013-03-07 17:41:20 +0000
4@@ -11,7 +11,7 @@
5 #The monitor number for the dock. Use -1 to keep on the primary monitor.
6 Monitor=-1
7 #List of *.dockitem files on this dock. DO NOT MODIFY
10 #The position for the dock on the monitor.
11 Position=3
12 #The dock's position offset from center (in percent).
13@@ -21,4 +21,4 @@
14 #The alignment for the dock on the monitor's edge.
15 Alignment=3
16 #The alignment of the items in this dock.
18\ No newline at end of file


People subscribed via source and target branches