Merge lp:~3v1n0/unity/missing-launcher-icon-fix-5.0 into lp:unity/5.0
Proposed by
Marco Trevisan (Treviño)
Status: | Merged | ||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Approved by: | Didier Roche-Tolomelli | ||||||||||||||||||||
Approved revision: | no longer in the source branch. | ||||||||||||||||||||
Merged at revision: | 2349 | ||||||||||||||||||||
Proposed branch: | lp:~3v1n0/unity/missing-launcher-icon-fix-5.0 | ||||||||||||||||||||
Merge into: | lp:unity/5.0 | ||||||||||||||||||||
Diff against target: |
394 lines (+155/-35) 8 files modified
plugins/unityshell/src/BamfLauncherIcon.cpp (+42/-3) plugins/unityshell/src/BamfLauncherIcon.h (+2/-0) plugins/unityshell/src/LauncherController.cpp (+0/-4) tests/autopilot/autopilot/emulators/bamf.py (+15/-8) tests/autopilot/autopilot/emulators/unity/icons.py (+7/-2) tests/autopilot/autopilot/emulators/unity/launcher.py (+8/-0) tests/autopilot/autopilot/tests/__init__.py (+3/-2) tests/autopilot/autopilot/tests/test_launcher.py (+78/-16) |
||||||||||||||||||||
To merge this branch: | bzr merge lp:~3v1n0/unity/missing-launcher-icon-fix-5.0 | ||||||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gord Allott (community) | Needs Information | ||
Review via email:
|
Commit message
Merged branches lp:~3v1n0/unity/launcher-double-icons-tests and lp:~3v1n0/unity/quick-app-reopen-icon-fix
Description of the change
Merged branches lp:~3v1n0/unity/launcher-double-icons-tests and lp:~3v1n0/unity/quick-app-reopen-icon-fix
To post a comment you must log in.
The Jenkins job https:/ /jenkins. qa.ubuntu. com/job/ automerge- unity/737/ console reported an error when processing this lp:~3v1n0/unity/missing-launcher-icon-fix-5.0 branch.
Not merging it.