Merge lp://staging/~unity-team/unity/x-sru6 into lp://staging/unity
Proposed by
Marco Trevisan (Treviño)
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~unity-team/unity/x-sru6 |
| Merge into: | lp://staging/unity |
| Diff against target: |
9045 lines (+6157/-2465) (has conflicts) 25 files modified
AUTHORS (+2/-0) CMakeLists.txt (+5/-0) ChangeLog (+5502/-2418) UnityCore/GLibSignal.h (+4/-0) dash/ResultRendererTile.cpp (+6/-0) data/CMakeLists.txt (+40/-0) debian/changelog (+250/-0) debian/control (+4/-0) debian/libunity-core-6.0-9.install (+5/-0) debian/rules (+6/-0) debian/unity-services.install (+4/-0) debian/unity.install (+7/-0) debian/unity.migrations (+4/-0) hud/HudController.cpp (+1/-1) launcher/EdgeBarrierController.cpp (+21/-36) launcher/EdgeBarrierControllerPrivate.h (+1/-4) lockscreen/LockScreenController.cpp (+8/-0) lockscreen/LockScreenController.h (+4/-0) plugins/unityshell/src/unityshell.cpp (+7/-3) services/unity-panel-service-lockscreen.service.in (+10/-0) tests/CMakeLists.txt (+157/-0) tests/test_lockscreen_controller.cpp (+12/-0) tools/CMakeLists.txt (+35/-0) unity-shared/UnitySettings.cpp (+51/-3) unity-shared/UpstartWrapper.cpp (+11/-0) Text conflict in CMakeLists.txt Text conflict in ChangeLog Text conflict in UnityCore/GLibSignal.h Text conflict in dash/ResultRendererTile.cpp Text conflict in data/CMakeLists.txt Text conflict in debian/changelog Text conflict in debian/control Text conflict in debian/libunity-core-6.0-9.install Text conflict in debian/rules Text conflict in debian/unity-services.install Text conflict in debian/unity.install Text conflict in debian/unity.migrations Text conflict in lockscreen/LockScreenController.cpp Text conflict in lockscreen/LockScreenController.h Text conflict in services/unity-panel-service-lockscreen.service.in Text conflict in tests/CMakeLists.txt Text conflict in tests/test_lockscreen_controller.cpp Text conflict in tools/CMakeLists.txt Text conflict in unity-shared/UnitySettings.cpp Text conflict in unity-shared/UpstartWrapper.cpp |
| To merge this branch: | bzr merge lp://staging/~unity-team/unity/x-sru6 |
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Unity Team | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2018-02-19.
Commit message
Unity Xenial SRU6
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
