elementary OS

Merge lp:~ricotz/elementaryos/plank-update into lp:~elementary-os/elementaryos/default-settings-loki

  1. plank-update
  2. Merge into default-settings-loki
Proposed by Rico Tzschichholz
Status: Merged
Approved by: Danielle Foré
Approved revision: no longer in the source branch.
Merged at revision: 165
Proposed branch: lp:~ricotz/elementaryos/plank-update
Merge into: lp:~elementary-os/elementaryos/default-settings-loki
Diff against target: 83 lines (+9/-9)
9 files modified
plank/dock1/launchers/audience.dockitem (+1/-1)
plank/dock1/launchers/gala-multitaskingview.dockitem (+1/-1)
plank/dock1/launchers/geary.dockitem (+1/-1)
plank/dock1/launchers/maya-calendar.dockitem (+1/-1)
plank/dock1/launchers/midori.dockitem (+1/-1)
plank/dock1/launchers/noise.dockitem (+1/-1)
plank/dock1/launchers/shotwell.dockitem (+1/-1)
plank/dock1/launchers/softwarecenter.dockitem (+1/-1)
plank/dock1/launchers/switchboard.dockitem (+1/-1)
To merge this branch: bzr merge lp:~ricotz/elementaryos/plank-update
Reviewer Review Type Date Requested Status
elementary OS team Pending
Review via email: mp+281223@code.launchpad.net

Commit message

Update plank's dockitem format

To post a comment you must log in.
lp:~ricotz/elementaryos/plank-update updated
165. By Rico Tzschichholz

Update plank's dockitem format

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plank/dock1/launchers/audience.dockitem'
--- plank/dock1/launchers/audience.dockitem 2014-10-18 01:10:25 +0000
+++ plank/dock1/launchers/audience.dockitem 2015-12-22 15:17:24 +0000
@@ -1,4 +1,4 @@
1[PlankItemsDockItemPreferences]1[PlankDockItemPreferences]
2Launcher=file:///usr/share/applications/audience.desktop2Launcher=file:///usr/share/applications/audience.desktop
33
44
55
=== modified file 'plank/dock1/launchers/gala-multitaskingview.dockitem'
--- plank/dock1/launchers/gala-multitaskingview.dockitem 2014-10-18 01:13:39 +0000
+++ plank/dock1/launchers/gala-multitaskingview.dockitem 2015-12-22 15:17:24 +0000
@@ -1,2 +1,2 @@
1[PlankItemsDockItemPreferences]1[PlankDockItemPreferences]
2Launcher=file:///usr/share/applications/gala-multitaskingview.desktop2Launcher=file:///usr/share/applications/gala-multitaskingview.desktop
33
=== modified file 'plank/dock1/launchers/geary.dockitem'
--- plank/dock1/launchers/geary.dockitem 2013-02-04 12:02:01 +0000
+++ plank/dock1/launchers/geary.dockitem 2015-12-22 15:17:24 +0000
@@ -1,4 +1,4 @@
1[PlankItemsDockItemPreferences]1[PlankDockItemPreferences]
2Launcher=file:///usr/share/applications/geary.desktop2Launcher=file:///usr/share/applications/geary.desktop
33
44
55
=== modified file 'plank/dock1/launchers/maya-calendar.dockitem'
--- plank/dock1/launchers/maya-calendar.dockitem 2013-07-15 03:20:58 +0000
+++ plank/dock1/launchers/maya-calendar.dockitem 2015-12-22 15:17:24 +0000
@@ -1,4 +1,4 @@
1[PlankItemsDockItemPreferences]1[PlankDockItemPreferences]
2Launcher=file:///usr/share/applications/maya-calendar.desktop2Launcher=file:///usr/share/applications/maya-calendar.desktop
33
44
55
=== modified file 'plank/dock1/launchers/midori.dockitem'
--- plank/dock1/launchers/midori.dockitem 2013-02-04 12:02:01 +0000
+++ plank/dock1/launchers/midori.dockitem 2015-12-22 15:17:24 +0000
@@ -1,4 +1,4 @@
1[PlankItemsDockItemPreferences]1[PlankDockItemPreferences]
2Launcher=file:///usr/share/applications/midori.desktop2Launcher=file:///usr/share/applications/midori.desktop
33
44
55
=== modified file 'plank/dock1/launchers/noise.dockitem'
--- plank/dock1/launchers/noise.dockitem 2013-02-04 12:02:01 +0000
+++ plank/dock1/launchers/noise.dockitem 2015-12-22 15:17:24 +0000
@@ -1,3 +1,3 @@
1[PlankItemsDockItemPreferences]1[PlankDockItemPreferences]
2Launcher=file:///usr/share/applications/noise.desktop2Launcher=file:///usr/share/applications/noise.desktop
33
44
=== modified file 'plank/dock1/launchers/shotwell.dockitem'
--- plank/dock1/launchers/shotwell.dockitem 2013-02-04 12:02:01 +0000
+++ plank/dock1/launchers/shotwell.dockitem 2015-12-22 15:17:24 +0000
@@ -1,3 +1,3 @@
1[PlankItemsDockItemPreferences]1[PlankDockItemPreferences]
2Launcher=file:///usr/share/applications/shotwell.desktop2Launcher=file:///usr/share/applications/shotwell.desktop
33
44
=== modified file 'plank/dock1/launchers/softwarecenter.dockitem'
--- plank/dock1/launchers/softwarecenter.dockitem 2013-02-04 12:02:01 +0000
+++ plank/dock1/launchers/softwarecenter.dockitem 2015-12-22 15:17:24 +0000
@@ -1,4 +1,4 @@
1[PlankItemsDockItemPreferences]1[PlankDockItemPreferences]
2Launcher=file:///usr/share/applications/ubuntu-software-center.desktop2Launcher=file:///usr/share/applications/ubuntu-software-center.desktop
33
44
55
=== modified file 'plank/dock1/launchers/switchboard.dockitem'
--- plank/dock1/launchers/switchboard.dockitem 2013-02-04 12:02:01 +0000
+++ plank/dock1/launchers/switchboard.dockitem 2015-12-22 15:17:24 +0000
@@ -1,3 +1,3 @@
1[PlankItemsDockItemPreferences]1[PlankDockItemPreferences]
2Launcher=file:///usr/share/applications/switchboard.desktop2Launcher=file:///usr/share/applications/switchboard.desktop
33

Subscribers

People subscribed via source and target branches