← Back to branch summary

~aacid/qtmir/clazy_run

~aacid/qtmir/clazy_run

Viewing all changes in revision 522.

Committer: Albert Astals Cid
Date: 2016-07-15 15:38:04 UTC
mfrom: (517.1.3 system_includes)
Revision ID: albert.astals@canonical.com-20160715153804-keuhxvdp3lqlo7cy

Merge

files added:
src/modules/Unity/Application/cgmanager.cpp

src/modules/Unity/Application/cgmanager.h

src/modules/Unity/Application/dbusfocusinfo.cpp

src/modules/Unity/Application/dbusfocusinfo.h

files removed:
src/modules/Unity/Application/ubuntukeyboardinfo.cpp

src/modules/Unity/Application/ubuntukeyboardinfo.h

files modified:
CMakeLists.txt

debian/changelog

debian/control

debian/gles-patches/convert-to-gles.patch

src/modules/Unity/Application/CMakeLists.txt

src/modules/Unity/Application/application.cpp

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/application_manager.h

src/modules/Unity/Application/mirsurface.cpp

src/modules/Unity/Application/mirsurface.h

src/modules/Unity/Application/mirsurfaceinterface.h

src/modules/Unity/Application/mirsurfaceitem.cpp

src/modules/Unity/Application/mirsurfaceitem.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/platforms/mirserver/logging.cpp

src/platforms/mirserver/logging.h

src/platforms/mirserver/mirwindowmanager.cpp

src/platforms/mirserver/surfaceobserver.cpp

src/platforms/mirserver/surfaceobserver.h

tests/framework/fake_mirsurface.h

tests/framework/fake_session.h

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/gles-patches/convert-to-gles.patch

src/modules/Unity/Application/CMakeLists.txt

src/modules/Unity/Application/application.cpp

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/application_manager.h

src/modules/Unity/Application/cgmanager.cpp

src/modules/Unity/Application/cgmanager.h

src/modules/Unity/Application/dbusfocusinfo.cpp

src/modules/Unity/Application/dbusfocusinfo.h

src/modules/Unity/Application/mirsurface.cpp

src/modules/Unity/Application/mirsurface.h

src/modules/Unity/Application/mirsurfaceinterface.h

src/modules/Unity/Application/mirsurfaceitem.cpp

src/modules/Unity/Application/mirsurfaceitem.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/ubuntukeyboardinfo.cpp

src/modules/Unity/Application/ubuntukeyboardinfo.h

src/platforms/mirserver/logging.cpp

src/platforms/mirserver/logging.h

src/platforms/mirserver/mirwindowmanager.cpp

src/platforms/mirserver/surfaceobserver.cpp

src/platforms/mirserver/surfaceobserver.h

tests/framework/fake_mirsurface.h

tests/framework/fake_session.h

Older »