unity-2d

Merge lp://staging/~sil2100/unity-2d/revert_and_fix into lp://staging/unity-2d

  1. revert_and_fix
  2. Merge into trunk
Proposed by Łukasz Zemczak
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 1146
Merged at revision: 1142
Proposed branch: lp://staging/~sil2100/unity-2d/revert_and_fix
Merge into: lp://staging/unity-2d
Diff against target: 137 lines (+11/-50)
6 files modified
debian/changelog (+9/-14)
panel/applets/appname/appnameapplet.cpp (+0/-6)
panel/applets/appname/windowhelper.cpp (+0/-26)
panel/applets/appname/windowhelper.h (+0/-2)
po/CMakeLists.txt (+1/-1)
po/update-unity-2d-pot (+1/-1)
To merge this branch: bzr merge lp://staging/~sil2100/unity-2d/revert_and_fix
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
unity-2d-team Pending
Review via email: mp+132027@code.staging.launchpad.net

Commit message

Revert 1109 and 1095 due to non-compliance with SRU criteria. Fixed some changelog mistakes.

Description of the change

Reverting two commits as pointed out by Didier. Also, fixed some changelog mistakes made.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1145
http://s-jenkins:8080/job/unity-2d-ci/27/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-2d-ci/./distribution=precise,flavor=amd64/27/console
    SUCCESS: http://s-jenkins:8080/job/unity-2d-ci/./distribution=precise,flavor=i386/27/console

review: Approve (continuous-integration)
lp://staging/~sil2100/unity-2d/revert_and_fix updated
1146. By Łukasz Zemczak

More fixes for the changelog

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches