← Back to branch summary

~gerboland/qtmir/initialSurfaceGeometry

~gerboland/qtmir/initialSurfaceGeometry

Viewing all changes in revision 269.

Committer: Gerry Boland
Date: 2015-07-13 21:57:15 UTC
mfrom: (224.75.34 detach-state-from-focus)
Revision ID: gerry.boland@canonical.com-20150713215715-9g1jqacnb4946qyv

Merge detach-state-from-focus and resolve conflicts

files added:
src/modules/Unity/Application/mirsurfaceiteminterface.h

tests/modules/common/fake_mirsurfaceitem.h

tests/modules/common/mock_mirsurfaceitem.h

tests/modules/common/qtmir_test.cpp

files modified:
CMakeLists.txt

debian/changelog

src/common/globals.h

src/modules/Unity/Application/CMakeLists.txt

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/applicationcontroller.h

src/modules/Unity/Application/applicationscreenshotprovider.cpp

src/modules/Unity/Application/mirsurfaceitem.cpp

src/modules/Unity/Application/mirsurfaceitem.h

src/modules/Unity/Application/mirsurfaceitemmodel.h

src/modules/Unity/Application/mirsurfacemanager.cpp

src/modules/Unity/Application/mirsurfacemanager.h

src/modules/Unity/Application/plugin.cpp

src/modules/Unity/Application/session.cpp

src/modules/Unity/Application/session.h

src/modules/Unity/Application/session_interface.h

src/modules/Unity/Application/taskcontroller.cpp

src/modules/Unity/Application/taskcontroller.h

src/modules/Unity/Application/upstart/applicationcontroller.cpp

src/platforms/mirserver/CMakeLists.txt

tests/modules/Application/CMakeLists.txt

tests/modules/Application/application_test.cpp

tests/modules/ApplicationManager/CMakeLists.txt

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/MirSurfaceItem/CMakeLists.txt

tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp

tests/modules/SessionManager/CMakeLists.txt

tests/modules/SessionManager/session_manager_test.cpp

tests/modules/SessionManager/session_test.cpp

tests/modules/TaskController/CMakeLists.txt

tests/modules/common/mock_session.h

tests/modules/common/qtmir_test.h

Show diffs side-by-side

added added

removed removed

debian/changelog

src/common/globals.h

src/modules/Unity/Application/CMakeLists.txt

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/applicationcontroller.h

src/modules/Unity/Application/applicationscreenshotprovider.cpp

src/modules/Unity/Application/mirsurfaceitem.cpp

src/modules/Unity/Application/mirsurfaceitem.h

src/modules/Unity/Application/mirsurfaceiteminterface.h

src/modules/Unity/Application/mirsurfaceitemmodel.h

src/modules/Unity/Application/mirsurfacemanager.cpp

src/modules/Unity/Application/mirsurfacemanager.h

src/modules/Unity/Application/plugin.cpp

src/modules/Unity/Application/session.cpp

src/modules/Unity/Application/session.h

src/modules/Unity/Application/session_interface.h

src/modules/Unity/Application/taskcontroller.cpp

src/modules/Unity/Application/taskcontroller.h

src/modules/Unity/Application/upstart/applicationcontroller.cpp

src/platforms/mirserver/CMakeLists.txt

tests/modules/Application/CMakeLists.txt

tests/modules/Application/application_test.cpp

tests/modules/ApplicationManager/CMakeLists.txt

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/MirSurfaceItem/CMakeLists.txt

tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp

tests/modules/SessionManager/CMakeLists.txt

tests/modules/SessionManager/session_manager_test.cpp

tests/modules/SessionManager/session_test.cpp

tests/modules/TaskController/CMakeLists.txt

tests/modules/common/fake_mirsurfaceitem.h

tests/modules/common/mock_mirsurfaceitem.h

tests/modules/common/mock_session.h

tests/modules/common/qtmir_test.cpp

tests/modules/common/qtmir_test.h

Older »