← Back to branch summary

~ted/qtmir/ual-pause

~ted/qtmir/ual-pause

Viewing all changes in revision 266.

Committer: Ted Gould
Date: 2014-10-06 21:53:23 UTC
mfrom: (252.1.14 qtmir)
Revision ID: ted@gould.cx-20141006215323-6renz4meg9ti6twh

Merge trunk

files added:
src/platforms/mirserver/clipboard.cpp

src/platforms/mirserver/clipboard.h

tests/mirserver/Clipboard

tests/mirserver/Clipboard/Clipboard.pro

tests/mirserver/Clipboard/clipboard_test.cpp

files removed:
src/platforms/mirserver/connectioncreator.cpp

src/platforms/mirserver/connectioncreator.h

src/platforms/mirserver/messageprocessor.cpp

src/platforms/mirserver/messageprocessor.h

src/platforms/mirserver/unityprotobufservice.cpp

src/platforms/mirserver/unityprotobufservice.h

src/platforms/mirserver/unityrpc.cpp

src/platforms/mirserver/unityrpc.h

src/platforms/mirserver/unityrpc.proto

files modified:
README

debian/changelog

debian/control

qtmir.pro

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

src/modules/Unity/Application/taskcontroller.cpp

src/modules/Unity/Application/taskcontroller.h

src/platforms/mirserver/logging.h

src/platforms/mirserver/mirserver.pro

src/platforms/mirserver/mirserverconfiguration.cpp

src/platforms/mirserver/mirserverconfiguration.h

src/platforms/mirserver/mirserverintegration.cpp

src/platforms/mirserver/mirserverintegration.h

src/platforms/mirserver/sessionauthorizer.cpp

src/platforms/mirserver/sessionauthorizer.h

tests/mirserver/mirserver.pro

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/TaskController/taskcontroller_test.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

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

src/modules/Unity/Application/taskcontroller.cpp

src/modules/Unity/Application/taskcontroller.h

src/platforms/mirserver/clipboard.cpp

src/platforms/mirserver/clipboard.h

src/platforms/mirserver/connectioncreator.cpp

src/platforms/mirserver/connectioncreator.h

src/platforms/mirserver/logging.h

src/platforms/mirserver/messageprocessor.cpp

src/platforms/mirserver/messageprocessor.h

src/platforms/mirserver/mirserver.pro

src/platforms/mirserver/mirserverconfiguration.cpp

src/platforms/mirserver/mirserverconfiguration.h

src/platforms/mirserver/mirserverintegration.cpp

src/platforms/mirserver/mirserverintegration.h

src/platforms/mirserver/sessionauthorizer.cpp

src/platforms/mirserver/sessionauthorizer.h

src/platforms/mirserver/unityprotobufservice.cpp

src/platforms/mirserver/unityprotobufservice.h

src/platforms/mirserver/unityrpc.cpp

src/platforms/mirserver/unityrpc.h

src/platforms/mirserver/unityrpc.proto

tests/mirserver/Clipboard/

tests/mirserver/Clipboard/Clipboard.pro

tests/mirserver/Clipboard/clipboard_test.cpp

tests/mirserver/mirserver.pro

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/TaskController/taskcontroller_test.cpp

Older »