← Back to branch summary

~lukas-kde/qtmir/betterSessionManagement

~lukas-kde/qtmir/betterSessionManagement

Viewing all changes in revision 597.

Committer: Lukáš Tinkl
Date: 2017-04-06 22:12:24 UTC
mfrom: (590.1.49 qtmir)
Revision ID: lukas.tinkl@canonical.com-20170406221224-9g3av1w2bhqwf3mi

merge trunk, resolve conflicts

files modified:
debian/changelog

src/modules/Unity/Application/application.cpp

src/modules/Unity/Application/application.h

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/application_manager.h

src/modules/Unity/Application/dbusfocusinfo.cpp

src/modules/Unity/Application/session.cpp

src/modules/Unity/Application/session_interface.h

src/platforms/mirserver/eventbuilder.cpp

src/platforms/mirserver/windowmanagementpolicy.cpp

src/platforms/mirserver/windowmanagementpolicy.h

tests/modules/Application/application_test.cpp

tests/modules/ApplicationManager/application_manager_test.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

src/modules/Unity/Application/application.cpp

src/modules/Unity/Application/application.h

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/application_manager.h

src/modules/Unity/Application/dbusfocusinfo.cpp

src/modules/Unity/Application/session.cpp

src/modules/Unity/Application/session_interface.h

src/platforms/mirserver/eventbuilder.cpp

src/platforms/mirserver/windowmanagementpolicy.cpp

src/platforms/mirserver/windowmanagementpolicy.h

tests/modules/Application/application_test.cpp

tests/modules/ApplicationManager/application_manager_test.cpp

Older »