← Back to branch summary

~nick-dedekind/qtmir/multimonitor.old

~nick-dedekind/qtmir/multimonitor.old

Viewing all changes in revision 434.4.18.

Committer: Michael Terry
Date: 2016-04-26 08:56:36 UTC
mfrom: (477 qtmir)
mto: This revision was merged to the branch mainline in revision 480.
Revision ID: michael.terry@canonical.com-20160426085636-cijtrh87np1yodds

Merge from trunk

files added:
debian/bileto_convert_to_gles

debian/gles-patches

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

debian/gles-patches/series

src/modules/Unity/Application/mirfocuscontroller.cpp

src/modules/Unity/Application/mirfocuscontroller.h

src/modules/Unity/Application/mirsurfacelistmodel.cpp

src/modules/Unity/Application/mirsurfacelistmodel.h

tests/convert-to-gles.sh

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

src/modules/Unity/Application/applicationscreenshotprovider.h

files modified:
CMakeLists.txt

README

debian/changelog

debian/control

src/modules/Unity/Application/CMakeLists.txt

src/modules/Unity/Application/application.cpp

src/modules/Unity/Application/application.h

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/CMakeLists.txt

src/platforms/mirserver/miropenglcontext.cpp

src/platforms/mirserver/miropenglcontext.h

src/platforms/mirserver/mirwindowmanager.cpp

tests/CMakeLists.txt

tests/framework/fake_mirsurface.cpp

tests/framework/fake_mirsurface.h

tests/framework/fake_session.cpp

tests/framework/fake_session.h

tests/framework/mock_session.h

tests/modules/Application/application_test.cpp

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/SessionManager/session_test.cpp

tests/modules/SurfaceManager/mirsurface_test.cpp

Show diffs side-by-side

added added

removed removed

debian/bileto_convert_to_gles

debian/changelog

debian/gles-patches/

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

debian/gles-patches/series

src/modules/Unity/Application/CMakeLists.txt

src/modules/Unity/Application/application.cpp

src/modules/Unity/Application/application.h

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/application_manager.h

src/modules/Unity/Application/applicationscreenshotprovider.cpp

src/modules/Unity/Application/applicationscreenshotprovider.h

src/modules/Unity/Application/mirfocuscontroller.cpp

src/modules/Unity/Application/mirfocuscontroller.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/mirsurfacelistmodel.cpp

src/modules/Unity/Application/mirsurfacelistmodel.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/CMakeLists.txt

src/platforms/mirserver/miropenglcontext.cpp

src/platforms/mirserver/miropenglcontext.h

src/platforms/mirserver/mirwindowmanager.cpp

tests/CMakeLists.txt

tests/convert-to-gles.sh

tests/framework/fake_mirsurface.cpp

tests/framework/fake_mirsurface.h

tests/framework/fake_session.cpp

tests/framework/fake_session.h

tests/framework/mock_session.h

tests/modules/Application/application_test.cpp

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/SessionManager/session_test.cpp

tests/modules/SurfaceManager/mirsurface_test.cpp

Older »