← Back to branch summary

~fboucault/unity-mir/dpr_rebase_qt_5.1

~fboucault/unity-mir/dpr_rebase_qt_5.1

Viewing all changes in revision 172.1.2.

Committer: Kevin Gunn
Date: 2014-02-12 18:19:36 UTC
mfrom: (176 unity-mir)
mto: This revision was merged to the branch mainline in revision 177.
Revision ID: kevin.gunn@canonical.com-20140212181936-6cvobrymc4ak32wo

update from trunk, changelog conflict

files added:
src/modules/Unity/Application/applicationcontroller.h

src/modules/Unity/Application/processcontroller.cpp

src/modules/Unity/Application/processcontroller.h

src/modules/Unity/Application/upstart

src/modules/Unity/Application/upstart/applicationcontroller.cpp

src/modules/Unity/Application/upstart/applicationcontroller.h

tests/application_manager_test.cpp

tests/mock_application_controller.h

tests/mock_desktop_file_reader.h

tests/mock_oom_controller.h

tests/mock_process_controller.h

tests/taskcontroller_test.cpp

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/desktopfilereader.cpp

src/modules/Unity/Application/desktopfilereader.h

src/modules/Unity/Application/taskcontroller.cpp

src/modules/Unity/Application/taskcontroller.h

tests/CMakeLists.txt

tests/auto/modules/Unity/Application/CMakeLists.txt

tests/auto/modules/Unity/Application/main.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

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/applicationcontroller.h

src/modules/Unity/Application/desktopfilereader.cpp

src/modules/Unity/Application/desktopfilereader.h

src/modules/Unity/Application/processcontroller.cpp

src/modules/Unity/Application/processcontroller.h

src/modules/Unity/Application/taskcontroller.cpp

src/modules/Unity/Application/taskcontroller.h

src/modules/Unity/Application/upstart/

src/modules/Unity/Application/upstart/applicationcontroller.cpp

src/modules/Unity/Application/upstart/applicationcontroller.h

tests/CMakeLists.txt

tests/application_manager_test.cpp

tests/auto/modules/Unity/Application/CMakeLists.txt

tests/auto/modules/Unity/Application/main.cpp

tests/mock_application_controller.h

tests/mock_desktop_file_reader.h

tests/mock_oom_controller.h

tests/mock_process_controller.h

tests/taskcontroller_test.cpp

Older »