← Back to branch summary

~gerboland/qtmir/remove-custom-framepump

~gerboland/qtmir/remove-custom-framepump

Viewing all changes in revision 284.

Committer: Gerry Boland
Date: 2014-12-05 18:58:54 UTC
mfrom: (282.2.6 qtmir)
Revision ID: gerry.boland@canonical.com-20141205185854-316ofrd6682p6e31

Merge trunk

files added:
CMakeLists.txt

cmake

cmake/modules

cmake/modules/FindGLESv2.cmake

cmake/modules/QmlPlugins.cmake

cmake/modules/QmlTest.cmake

cmake/modules/UseLttngGenTp.cmake

cmake/modules/autopilot.cmake

src/CMakeLists.txt

src/modules/CMakeLists.txt

src/modules/Unity/Application/CMakeLists.txt

src/modules/Unity/CMakeLists.txt

src/platforms/CMakeLists.txt

src/platforms/mirserver/CMakeLists.txt

tests/CMakeLists.txt

tests/mirserver/CMakeLists.txt

tests/mirserver/Clipboard/CMakeLists.txt

tests/mirserver/QtEventFeeder/CMakeLists.txt

tests/mirserver/Screen/CMakeLists.txt

tests/modules/ApplicationManager/CMakeLists.txt

tests/modules/CMakeLists.txt

tests/modules/DesktopFileReader/CMakeLists.txt

tests/modules/General/CMakeLists.txt

tests/modules/MirSurfaceItem/CMakeLists.txt

tests/modules/SessionManager/CMakeLists.txt

tests/modules/TaskController/CMakeLists.txt

files removed:
qtmir.pro

src/lttng-compiler.pri

src/modules/Unity/Application/Application.pro

src/modules/modules.pro

src/platforms/mirserver/mirserver.pro

src/platforms/platforms.pro

src/src.pro

tests/google-mock.pri

tests/mirserver/Clipboard/Clipboard.pro

tests/mirserver/QtEventFeeder/QtEventFeeder.pro

tests/mirserver/Screen/Screen.pro

tests/mirserver/mirserver.pro

tests/modules/ApplicationManager/ApplicationManager.pro

tests/modules/DesktopFileReader/DesktopFileReader.pro

tests/modules/General/General.pro

tests/modules/MirSurfaceItem/MirSurfaceItem.pro

tests/modules/SessionManager/SessionManager.pro

tests/modules/TaskController/TaskController.pro

tests/modules/common/common.pri

tests/modules/modules.pro

tests/test-includes.pri

tests/tests.pro

files modified:
debian/changelog

debian/control

debian/rules

src/modules/Unity/Application/desktopfilereader.h

src/modules/Unity/Application/mirbuffersgtexture.cpp

src/platforms/mirserver/mirserverintegration.cpp

src/platforms/mirserver/mirserverintegration.h

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/DesktopFileReader/desktopfilereader_test.cpp

tests/modules/common/mock_proc_info.h

Show diffs side-by-side

added added

removed removed

cmake/modules/FindGLESv2.cmake

cmake/modules/QmlPlugins.cmake

cmake/modules/QmlTest.cmake

cmake/modules/UseLttngGenTp.cmake

cmake/modules/autopilot.cmake

debian/changelog

src/CMakeLists.txt

src/lttng-compiler.pri

src/modules/CMakeLists.txt

src/modules/Unity/Application/Application.pro

src/modules/Unity/Application/CMakeLists.txt

src/modules/Unity/Application/desktopfilereader.h

src/modules/Unity/Application/mirbuffersgtexture.cpp

src/modules/Unity/CMakeLists.txt

src/modules/modules.pro

src/platforms/CMakeLists.txt

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/mirserver.pro

src/platforms/mirserver/mirserverintegration.cpp

src/platforms/mirserver/mirserverintegration.h

src/platforms/platforms.pro

tests/CMakeLists.txt

tests/google-mock.pri

tests/mirserver/CMakeLists.txt

tests/mirserver/Clipboard/CMakeLists.txt

tests/mirserver/Clipboard/Clipboard.pro

tests/mirserver/QtEventFeeder/CMakeLists.txt

tests/mirserver/QtEventFeeder/QtEventFeeder.pro

tests/mirserver/Screen/CMakeLists.txt

tests/mirserver/Screen/Screen.pro

tests/mirserver/mirserver.pro

tests/modules/ApplicationManager/ApplicationManager.pro

tests/modules/ApplicationManager/CMakeLists.txt

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/CMakeLists.txt

tests/modules/DesktopFileReader/CMakeLists.txt

tests/modules/DesktopFileReader/DesktopFileReader.pro

tests/modules/DesktopFileReader/desktopfilereader_test.cpp

tests/modules/General/CMakeLists.txt

tests/modules/General/General.pro

tests/modules/MirSurfaceItem/CMakeLists.txt

tests/modules/MirSurfaceItem/MirSurfaceItem.pro

tests/modules/SessionManager/CMakeLists.txt

tests/modules/SessionManager/SessionManager.pro

tests/modules/TaskController/CMakeLists.txt

tests/modules/TaskController/TaskController.pro

tests/modules/common/common.pri

tests/modules/common/mock_proc_info.h

tests/modules/modules.pro

tests/test-includes.pri

tests/tests.pro

Older »