Merge lp://staging/~mir-team/qtmir/rtm-14.09-staging into lp://staging/qtmir/rtm-14.09
Proposed by
Michał Sawicz
| Status: | Merged | ||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Approved by: | kevin gunn | ||||||||||||||||||||
| Approved revision: | 288 | ||||||||||||||||||||
| Merged at revision: | 285 | ||||||||||||||||||||
| Proposed branch: | lp://staging/~mir-team/qtmir/rtm-14.09-staging | ||||||||||||||||||||
| Merge into: | lp://staging/qtmir/rtm-14.09 | ||||||||||||||||||||
| Diff against target: |
261 lines (+121/-6) 10 files modified
debian/changelog (+13/-0) debian/control (+1/-1) src/modules/Unity/Application/session.cpp (+14/-1) src/platforms/mirserver/promptsessionlistener.cpp (+12/-0) src/platforms/mirserver/promptsessionlistener.h (+4/-0) src/platforms/mirserver/qteventfeeder.cpp (+7/-0) tests/modules/SessionManager/session_test.cpp (+58/-0) tests/modules/common/mock_mir_session.h (+3/-1) tests/modules/common/mock_prompt_session.h (+5/-0) tests/modules/common/mock_prompt_session_manager.h (+4/-3) |
||||||||||||||||||||
| To merge this branch: | bzr merge lp://staging/~mir-team/qtmir/rtm-14.09-staging | ||||||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michał Sawicz | Approve | ||
|
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
As per upstream changes