← Back to branch summary

~mir-team/unity-mir/staged-next-rev

~mir-team/unity-mir/staged-next-rev

Viewing all changes in revision 161.2.3.

Committer: Michael Terry
Date: 2014-02-18 22:20:29 UTC
mfrom: (180 unity-mir)
mto: This revision was merged to the branch mainline in revision 182.
Revision ID: michael.terry@canonical.com-20140218222029-wfltid653bs70r52

Merge from trunk

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

src/unity-mir/messageprocessor.cpp

src/unity-mir/messageprocessor.h

src/unity-mir/sessioncreator.cpp

src/unity-mir/sessioncreator.h

src/unity-mir/unityprotobufservice.cpp

src/unity-mir/unityprotobufservice.h

src/unity-mir/unityrpc.proto

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

src/unity-mir/CMakeLists.txt

src/unity-mir/shellserverconfiguration.cpp

src/unity-mir/shellserverconfiguration.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

src/unity-mir/CMakeLists.txt

src/unity-mir/messageprocessor.cpp

src/unity-mir/messageprocessor.h

src/unity-mir/sessioncreator.cpp

src/unity-mir/sessioncreator.h

src/unity-mir/shellserverconfiguration.cpp

src/unity-mir/shellserverconfiguration.h

src/unity-mir/unityprotobufservice.cpp

src/unity-mir/unityprotobufservice.h

src/unity-mir/unityrpc.proto

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 »