← Back to branch summary

~gerboland/unity-mir/enable-OSK-surface

~gerboland/unity-mir/enable-OSK-surface

Viewing all changes in revision 51.

Committer: Gerry Boland
Date: 2013-08-22 17:26:03 UTC
mfrom: (46.1.12 trunk)
Revision ID: gerry.boland@canonical.com-20130822172603-3heqfzsf1ek6nn41

Merge trunk

files renamed:
src/unity-mir/surfacebuilder.cpp => src/unity-mir/surfacecontroller.cpp

src/unity-mir/surfacebuilder.h => src/unity-mir/surfacecontroller.h

files modified:
debian/changelog

src/modules/Unity/ApplicationManager/ApplicationManager.pro

src/modules/Unity/ApplicationManager/application_manager.cpp

src/modules/Unity/ApplicationManager/dbuswindowstack.cpp

src/modules/Unity/ApplicationManager/dbuswindowstack.h

src/modules/Unity/SurfaceManager/SurfaceManager.pro

src/unity-mir/initialsurfaceplacementstrategy.cpp

src/unity-mir/initialsurfaceplacementstrategy.h

src/unity-mir/logging.h

src/unity-mir/qmirserver.cpp

src/unity-mir/shellserverconfiguration.cpp

src/unity-mir/shellserverconfiguration.h

src/unity-mir/unity-mir.pro

Show diffs side-by-side

added added

removed removed

debian/changelog

src/modules/Unity/ApplicationManager/ApplicationManager.pro

src/modules/Unity/ApplicationManager/application_manager.cpp

src/modules/Unity/ApplicationManager/dbuswindowstack.cpp

src/modules/Unity/ApplicationManager/dbuswindowstack.h

src/modules/Unity/SurfaceManager/SurfaceManager.pro

src/unity-mir/initialsurfaceplacementstrategy.cpp

src/unity-mir/initialsurfaceplacementstrategy.h

src/unity-mir/logging.h

src/unity-mir/qmirserver.cpp

src/unity-mir/shellserverconfiguration.cpp

src/unity-mir/shellserverconfiguration.h

src/unity-mir/surfacecontroller.cpp

src/unity-mir/surfacecontroller.h

src/unity-mir/unity-mir.pro

Older »