← Back to branch summary

~gerboland/qtmir/appRestart-lp1527737-rebased

~gerboland/qtmir/appRestart-lp1527737-rebased

Viewing all changes in revision 445.

Committer: Gerry Boland
Date: 2016-03-08 15:14:47 UTC
mfrom: (438.2.14 qtmir)
Revision ID: gerry.boland@canonical.com-20160308151447-qia8z70dfo614o8p

Merge trunk & resolve conflicts

files added:
src/platforms/mirserver/sizehints.cpp

src/platforms/mirserver/sizehints.h

files modified:
CMakeLists.txt

debian/changelog

src/common/timestamp_impl.h

src/modules/Unity/Application/application.cpp

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/mirsurface.cpp

src/modules/Unity/Application/mirsurface.h

src/modules/Unity/Application/mirsurfaceinterface.h

src/modules/Unity/Application/mirsurfacemanager.cpp

src/modules/Unity/Application/mirsurfacemanager.h

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/mirserver.cpp

src/platforms/mirserver/mirwindowmanager.cpp

src/platforms/mirserver/mirwindowmanager.h

src/platforms/mirserver/sessionlistener.cpp

src/platforms/mirserver/sessionlistener.h

src/platforms/mirserver/surfaceobserver.cpp

src/platforms/mirserver/surfaceobserver.h

tests/framework/fake_mirsurface.h

tests/framework/mock_display.h

tests/framework/mock_task_controller.h

tests/mirserver/WindowManager/window_manager.cpp

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/SurfaceManager/mirsurface_test.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

src/common/timestamp_impl.h

src/modules/Unity/Application/application.cpp

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/mirsurface.cpp

src/modules/Unity/Application/mirsurface.h

src/modules/Unity/Application/mirsurfaceinterface.h

src/modules/Unity/Application/mirsurfacemanager.cpp

src/modules/Unity/Application/mirsurfacemanager.h

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/mirserver.cpp

src/platforms/mirserver/mirwindowmanager.cpp

src/platforms/mirserver/mirwindowmanager.h

src/platforms/mirserver/sessionlistener.cpp

src/platforms/mirserver/sessionlistener.h

src/platforms/mirserver/sizehints.cpp

src/platforms/mirserver/sizehints.h

src/platforms/mirserver/surfaceobserver.cpp

src/platforms/mirserver/surfaceobserver.h

tests/framework/fake_mirsurface.h

tests/framework/mock_display.h

tests/framework/mock_task_controller.h

tests/mirserver/WindowManager/window_manager.cpp

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/SurfaceManager/mirsurface_test.cpp

Older »