ubiquity

Merge lp:~darkxst/ubiquity/lp1284983 into lp:ubiquity

  1. lp1284983
  2. Merge into trunk
Proposed by Tim Lunn
Status: Merged
Merged at revision: 6123
Proposed branch: lp:~darkxst/ubiquity/lp1284983
Merge into: lp:ubiquity
Diff against target: 29 lines (+6/-3)
2 files modified
data/ubiquity.json (+2/-2)
debian/changelog (+4/-1)
To merge this branch: bzr merge lp:~darkxst/ubiquity/lp1284983
Reviewer Review Type Date Requested Status
Dimitri John Ledkov Approve
Review via email: mp+208279@code.launchpad.net
To post a comment you must log in.
lp:~darkxst/ubiquity/lp1284983 updated
6124. By Tim Lunn

fix version

Revision history for this message
Dimitri John Ledkov (xnox) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/ubiquity.json'
2--- data/ubiquity.json 2013-08-27 06:20:18 +0000
3+++ data/ubiquity.json 2014-02-26 06:11:45 +0000
4@@ -2,8 +2,8 @@
5 "hasWindows": true,
6 "components": ["polkitAgent", "networkAgent"],
7 "panel": { "left": [],
8- "center": [],
9- "right": ["a11yGreeter", "keyboard", "volume", "network","battery", "powerMenu"]
10+ "center": ["dateMenu"],
11+ "right": ["a11yGreeter", "keyboard", "aggregateMenu"]
12 }
13 }
14
15
16=== modified file 'debian/changelog'
17--- debian/changelog 2014-02-22 11:01:14 +0000
18+++ debian/changelog 2014-02-26 06:11:45 +0000
19@@ -4,7 +4,10 @@
20 * Remove redundant placeholder text from fields on user-entry page (LP:
21 #1283047)
22
23- -- Dimitri John Ledkov <xnox@ubuntu.com> Sat, 22 Feb 2014 11:00:22 +0000
24+ [ Tim Lunn ]
25+ * Update ubiquity gnome-shell mode for 3.10 (LP: #1284983)
26+
27+ -- Tim Lunn <tim@feathertop.org> Wed, 26 Feb 2014 16:59:12 +1100
28
29 ubiquity (2.17.8) trusty; urgency=medium
30

Subscribers

People subscribed via source and target branches

to status/vote changes: