← Back to branch summary

~gerboland/qtmir/initialSurfaceGeometry

~gerboland/qtmir/initialSurfaceGeometry

Viewing all changes in revision 261.

Committer: Gerry Boland
Date: 2015-01-13 14:41:44 UTC
mfrom: (224.1.77 qtmir)
Revision ID: gerry.boland@canonical.com-20150113144144-jluf35ena334lxv6

Merge trunk

files modified:
debian/changelog

debian/control

src/modules/Unity/Application/mirsurfaceitem.h

src/modules/Unity/Application/session.cpp

src/platforms/mirserver/displaywindow.cpp

src/platforms/mirserver/promptsessionlistener.cpp

src/platforms/mirserver/promptsessionlistener.h

tests/modules/SessionManager/session_test.cpp

tests/modules/common/mock_mir_session.h

tests/modules/common/mock_prompt_session.h

tests/modules/common/mock_prompt_session_manager.h

tests/modules/common/mock_surface.h

Show diffs side-by-side

added added

removed removed

debian/changelog

src/modules/Unity/Application/mirsurfaceitem.h

src/modules/Unity/Application/session.cpp

src/platforms/mirserver/displaywindow.cpp

src/platforms/mirserver/promptsessionlistener.cpp

src/platforms/mirserver/promptsessionlistener.h

tests/modules/SessionManager/session_test.cpp

tests/modules/common/mock_mir_session.h

tests/modules/common/mock_prompt_session.h

tests/modules/common/mock_prompt_session_manager.h

tests/modules/common/mock_surface.h

Older »