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
1=== modified file 'plank/dock1/launchers/audience.dockitem'
2--- plank/dock1/launchers/audience.dockitem 2014-10-18 01:10:25 +0000
3+++ plank/dock1/launchers/audience.dockitem 2015-12-22 15:17:24 +0000
4@@ -1,4 +1,4 @@
5-[PlankItemsDockItemPreferences]
6+[PlankDockItemPreferences]
7 Launcher=file:///usr/share/applications/audience.desktop
8
9
10
11=== modified file 'plank/dock1/launchers/gala-multitaskingview.dockitem'
12--- plank/dock1/launchers/gala-multitaskingview.dockitem 2014-10-18 01:13:39 +0000
13+++ plank/dock1/launchers/gala-multitaskingview.dockitem 2015-12-22 15:17:24 +0000
14@@ -1,2 +1,2 @@
15-[PlankItemsDockItemPreferences]
16+[PlankDockItemPreferences]
17 Launcher=file:///usr/share/applications/gala-multitaskingview.desktop
18
19=== modified file 'plank/dock1/launchers/geary.dockitem'
20--- plank/dock1/launchers/geary.dockitem 2013-02-04 12:02:01 +0000
21+++ plank/dock1/launchers/geary.dockitem 2015-12-22 15:17:24 +0000
22@@ -1,4 +1,4 @@
23-[PlankItemsDockItemPreferences]
24+[PlankDockItemPreferences]
25 Launcher=file:///usr/share/applications/geary.desktop
26
27
28
29=== modified file 'plank/dock1/launchers/maya-calendar.dockitem'
30--- plank/dock1/launchers/maya-calendar.dockitem 2013-07-15 03:20:58 +0000
31+++ plank/dock1/launchers/maya-calendar.dockitem 2015-12-22 15:17:24 +0000
32@@ -1,4 +1,4 @@
33-[PlankItemsDockItemPreferences]
34+[PlankDockItemPreferences]
35 Launcher=file:///usr/share/applications/maya-calendar.desktop
36
37
38
39=== modified file 'plank/dock1/launchers/midori.dockitem'
40--- plank/dock1/launchers/midori.dockitem 2013-02-04 12:02:01 +0000
41+++ plank/dock1/launchers/midori.dockitem 2015-12-22 15:17:24 +0000
42@@ -1,4 +1,4 @@
43-[PlankItemsDockItemPreferences]
44+[PlankDockItemPreferences]
45 Launcher=file:///usr/share/applications/midori.desktop
46
47
48
49=== modified file 'plank/dock1/launchers/noise.dockitem'
50--- plank/dock1/launchers/noise.dockitem 2013-02-04 12:02:01 +0000
51+++ plank/dock1/launchers/noise.dockitem 2015-12-22 15:17:24 +0000
52@@ -1,3 +1,3 @@
53-[PlankItemsDockItemPreferences]
54+[PlankDockItemPreferences]
55 Launcher=file:///usr/share/applications/noise.desktop
56
57
58=== modified file 'plank/dock1/launchers/shotwell.dockitem'
59--- plank/dock1/launchers/shotwell.dockitem 2013-02-04 12:02:01 +0000
60+++ plank/dock1/launchers/shotwell.dockitem 2015-12-22 15:17:24 +0000
61@@ -1,3 +1,3 @@
62-[PlankItemsDockItemPreferences]
63+[PlankDockItemPreferences]
64 Launcher=file:///usr/share/applications/shotwell.desktop
65
66
67=== modified file 'plank/dock1/launchers/softwarecenter.dockitem'
68--- plank/dock1/launchers/softwarecenter.dockitem 2013-02-04 12:02:01 +0000
69+++ plank/dock1/launchers/softwarecenter.dockitem 2015-12-22 15:17:24 +0000
70@@ -1,4 +1,4 @@
71-[PlankItemsDockItemPreferences]
72+[PlankDockItemPreferences]
73 Launcher=file:///usr/share/applications/ubuntu-software-center.desktop
74
75
76
77=== modified file 'plank/dock1/launchers/switchboard.dockitem'
78--- plank/dock1/launchers/switchboard.dockitem 2013-02-04 12:02:01 +0000
79+++ plank/dock1/launchers/switchboard.dockitem 2015-12-22 15:17:24 +0000
80@@ -1,3 +1,3 @@
81-[PlankItemsDockItemPreferences]
82+[PlankDockItemPreferences]
83 Launcher=file:///usr/share/applications/switchboard.desktop
84

Subscribers

People subscribed via source and target branches