← Back to branch summary

~mzanetti/qtmir/dpr

~mzanetti/qtmir/dpr

Viewing all changes in revision 324.

Committer: Michael Zanetti
Date: 2015-03-19 10:17:25 UTC
mfrom: (321.2.7 qtmir)
Revision ID: michael.zanetti@canonical.com-20150319101725-4um282t5n0u5crpx

merge trunk

files modified:
CMakeLists.txt

debian/changelog

debian/control

src/common/abstractdbusservicemonitor.cpp

src/common/abstractdbusservicemonitor.h

src/common/debughelpers.cpp

src/modules/Unity/Application/application.cpp

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/mirsurfaceitem.cpp

src/modules/Unity/Application/mirsurfaceitem.h

src/modules/Unity/Application/sharedwakelock.cpp

src/modules/Unity/Application/sharedwakelock.h

src/platforms/mirserver/qteventfeeder.cpp

src/platforms/mirserver/qteventfeeder.h

tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h

tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp

tests/mirserver/Screen/screen_test.cpp

tests/modules/Application/application_test.cpp

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp

tests/modules/SharedWakelock/CMakeLists.txt

tests/modules/SharedWakelock/sharedwakelock_test.cpp

tests/modules/common/mock_shared_wakelock.h

Show diffs side-by-side

added added

removed removed

debian/changelog

src/common/abstractdbusservicemonitor.cpp

src/common/abstractdbusservicemonitor.h

src/common/debughelpers.cpp

src/modules/Unity/Application/application.cpp

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/mirsurfaceitem.cpp

src/modules/Unity/Application/mirsurfaceitem.h

src/modules/Unity/Application/sharedwakelock.cpp

src/modules/Unity/Application/sharedwakelock.h

src/platforms/mirserver/qteventfeeder.cpp

src/platforms/mirserver/qteventfeeder.h

tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h

tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp

tests/mirserver/Screen/screen_test.cpp

tests/modules/Application/application_test.cpp

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp

tests/modules/SharedWakelock/CMakeLists.txt

tests/modules/SharedWakelock/sharedwakelock_test.cpp

tests/modules/common/mock_shared_wakelock.h

Older »