elementary OS

Merge lp:~codygarver/elementaryos/primary-display into lp:~elementary-os/elementaryos/default-settings-luna

  1. primary-display
  2. Merge into default-settings-luna
Proposed by Cody Garver
Status: Merged
Approved by: Cassidy James Blaede
Approved revision: 67
Merged at revision: 67
Proposed branch: lp:~codygarver/elementaryos/primary-display
Merge into: lp:~elementary-os/elementaryos/default-settings-luna
Diff against target: 14 lines (+2/-2)
1 file modified
plank/dock1/settings (+2/-2)
To merge this branch: bzr merge lp:~codygarver/elementaryos/primary-display
Reviewer Review Type Date Requested Status
Cassidy James Blaede (community) Approve
Review via email: mp+134225@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Cassidy James Blaede (cassidyjames) wrote :

Perfect.

review: Approve

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 2012-06-04 12:11:20 +0000
3+++ plank/dock1/settings 2012-11-13 23:21:25 +0000
4@@ -5,8 +5,8 @@
5 HideMode=3
6 #Time (in ms) to wait before unhiding the dock.
7 UnhideDelay=0
8-#The monitor number for the dock.
9-Monitor=0
10+#The monitor number for the dock. If -1, the dock will follow the primary display.
11+Monitor=-1
12 #List of *.dockitem files on this dock. DO NOT MODIFY
13 DockItems=
14 #The position for the dock on the monitor.

Subscribers

People subscribed via source and target branches