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

[Cody Garver]

[lp:~codygarver/elementaryos/launcher-order]

87. By Cody Garver on 2013-03-07

Rearrange.

=== modified file 'plank/dock1/settings'
--- plank/dock1/settings	2013-02-04 12:02:01 +0000
+++ plank/dock1/settings	2013-03-07 17:41:20 +0000
@@ -11,7 +11,7 @@
 #The monitor number for the dock. Use -1 to keep on the primary monitor.
 Monitor=-1
 #List of *.dockitem files on this dock. DO NOT MODIFY
-DockItems=
+DockItems=midori.dockitem;;geary.dockitem;;empathy.dockitem;;maya-calendar.dockitem;;noise.dockitem;;totem.dockitem;;shotwell.dockitem;;switchboard.dockitem;;softwarecenter.dockitem
 #The position for the dock on the monitor.
 Position=3
 #The dock's position offset from center (in percent).
@@ -21,4 +21,4 @@
 #The alignment for the dock on the monitor's edge.
 Alignment=3
 #The alignment of the items in this dock.
-ItemsAlignment=3
 \ No newline at end of file
+ItemsAlignment=3