Merge lp://staging/~unity-api-team/hud/forward-port into lp://staging/hud/14.10
Proposed by
Pete Woods
Status: | Merged |
---|---|
Approved by: | Pete Woods |
Approved revision: | 395 |
Merged at revision: | 394 |
Proposed branch: | lp://staging/~unity-api-team/hud/forward-port |
Merge into: | lp://staging/hud/14.10 |
Diff against target: |
1455 lines (+515/-209) 14 files modified
data/hud.conf.in (+0/-12) debian/changelog (+34/-0) libqtgmenu/QtGMenuImporter.cpp (+2/-2) libqtgmenu/QtGMenuImporter.h (+2/-2) libqtgmenu/internal/QtGActionGroup.cpp (+31/-31) libqtgmenu/internal/QtGActionGroup.h (+7/-3) libqtgmenu/internal/QtGMenuImporterPrivate.cpp (+21/-13) libqtgmenu/internal/QtGMenuImporterPrivate.h (+4/-3) libqtgmenu/internal/QtGMenuModel.cpp (+331/-99) libqtgmenu/internal/QtGMenuModel.h (+20/-17) service/DBusMenuCollector.cpp (+9/-17) service/HudServiceImpl.cpp (+45/-5) service/HudServiceImpl.h (+5/-1) tests/unit/qtgmenu/TestQtGMenu.cpp (+4/-4) |
To merge this branch: | bzr merge lp://staging/~unity-api-team/hud/forward-port |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Indicator Applet Developers | Pending | ||
Review via email: mp+223025@code.staging.launchpad.net |
Commit message
Forward port trusty SRU
Description of the change
Forward port trusty SRU
To post a comment you must log in.
PASSED: Continuous integration, rev:395 jenkins. qa.ubuntu. com/job/ hud-ci/ 289/ jenkins. qa.ubuntu. com/job/ hud-utopic- amd64-ci/ 4 jenkins. qa.ubuntu. com/job/ hud-utopic- armhf-ci/ 4 jenkins. qa.ubuntu. com/job/ hud-utopic- i386-ci/ 4
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/hud- ci/289/ rebuild
http://