Merge lp://qastaging/~nick-dedekind/unity-mir/unity-mir.trusted_sessions into lp://qastaging/unity-mir
Proposed by
Nick Dedekind
| Status: | Merged |
|---|---|
| Merged at revision: | 241 |
| Proposed branch: | lp://qastaging/~nick-dedekind/unity-mir/unity-mir.trusted_sessions |
| Merge into: | lp://qastaging/unity-mir |
| Diff against target: |
1073 lines (+438/-123) 14 files modified
src/modules/Unity/Application/ApplicationImage.qml (+8/-0) src/modules/Unity/Application/CMakeLists.txt (+4/-2) src/modules/Unity/Application/application.cpp (+33/-11) src/modules/Unity/Application/application.h (+18/-4) src/modules/Unity/Application/application_manager.cpp (+196/-86) src/modules/Unity/Application/application_manager.h (+11/-6) src/modules/Unity/Application/applicationscreenshotprovider.cpp (+4/-2) src/modules/Unity/Application/dbuswindowstack.cpp (+1/-1) src/modules/Unity/Application/mirsurfacemanager.cpp (+13/-10) src/modules/Unity/Application/session.cpp (+70/-0) src/modules/Unity/Application/session.h (+60/-0) src/unity-mir/sessionlistener.cpp (+13/-0) src/unity-mir/sessionlistener.h (+6/-0) src/unity-mir/shellserverconfiguration.cpp (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~nick-dedekind/unity-mir/unity-mir.trusted_sessions |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mir development team | Pending | ||
|
Review via email:
|
|||
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
