← Back to branch summary

~gerboland/qtmir/multimonitor-spike

~gerboland/qtmir/multimonitor-spike

Viewing all changes in revision 340.

Committer: Gerry Boland
Date: 2015-07-27 10:17:17 UTC
mfrom: (284.1.63 qtmir)
Revision ID: gerry.boland@canonical.com-20150727101717-mgzdc02z3nrd84x6

Merge trunk

files modified:
debian/changelog

debian/control

src/common/debughelpers.h

src/modules/Unity/Application/mirsurfaceitem.cpp

src/platforms/mirserver/qteventfeeder.cpp

src/platforms/mirserver/qteventfeeder.h

tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp

tests/modules/common/mock_mir_session.h

tests/modules/common/mock_surface.h

tests/modules/common/stub_scene_surface.h

Show diffs side-by-side

added added

removed removed

debian/changelog

src/common/debughelpers.h

src/modules/Unity/Application/mirsurfaceitem.cpp

src/platforms/mirserver/qteventfeeder.cpp

src/platforms/mirserver/qteventfeeder.h

tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp

tests/modules/common/mock_mir_session.h

tests/modules/common/mock_surface.h

tests/modules/common/stub_scene_surface.h

Older »