indicator-power

Merge lp:~didrocks/indicator-power/changes_from_trunk.12.10 into lp:indicator-power/13.04

  1. changes_from_trunk.12.10
  2. Merge into trunk.13.04
Proposed by Didier Roche-Tolomelli
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: no longer in the source branch.
Merged at revision: 157
Proposed branch: lp:~didrocks/indicator-power/changes_from_trunk.12.10
Merge into: lp:indicator-power/13.04
Diff against target: 29 lines (+12/-1)
2 files modified
NEWS (+11/-0)
configure.ac (+1/-1)
To merge this branch: bzr merge lp:~didrocks/indicator-power/changes_from_trunk.12.10
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Lars Karlitski (community) Approve
Review via email: mp+134643@code.launchpad.net

Commit message

Report missing changes in indicator-power trunk from trunk.12.10

Description of the change

Report missing changes in indicator-power trunk from trunk.12.10

To post a comment you must log in.
Revision history for this message
Lars Karlitski (larsu) wrote :

Thanks!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/indicator-power-autolanding/13/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-power-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/13/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-power-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/13/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:157
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/17/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-power-ci/./build=pbuilder,distribution=quantal,flavor=amd64/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-power-ci/./build=pbuilder,distribution=quantal,flavor=i386/17/console

review: Needs Fixing (continuous-integration)
lp:~didrocks/indicator-power/changes_from_trunk.12.10 updated
157. By Didier Roche-Tolomelli

Report missing changes in indicator-power trunk from trunk.12.10.

Approved by Lars Uebernickel.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2012-11-14 18:54:41 +0000
3+++ NEWS 2012-11-16 13:23:26 +0000
4@@ -1,3 +1,14 @@
5+12.10.5
6+ - Fix a device display bug introduced in 12.10.3 (LP: #1075192)
7+
8+12.10.4
9+ - Fix primary device selection bug introduced in 12.10.3 (LP: #1071757)
10+
11+12.10.3
12+ - Show the proper icon for mice and ups devices. (LP: #1066208)
13+ - Follow the spec when choosing the primary device (LP: #1071645)
14+ - Fix minor memory leaks
15+
16 12.10.2
17 - Show a more accurate view of discharging batteries (LP: #1054146)
18 - Fix a GIcon memory leak
19
20=== modified file 'configure.ac'
21--- configure.ac 2012-11-14 18:54:41 +0000
22+++ configure.ac 2012-11-16 13:23:26 +0000
23@@ -1,5 +1,5 @@
24 AC_INIT([indicator-power],
25- [12.10.2],
26+ [12.10.6],
27 [http://bugs.launchpad.net/indicator-power],
28 [indicator-power],
29 [http://launchpad.net/indicator-power])

Subscribers

People subscribed via source and target branches