← Back to branch summary

~mhr3/unity-scopes-api/merge-trunk

~mhr3/unity-scopes-api/merge-trunk

Viewing all changes in revision 420.3.9.

Committer: Michi Henning
Date: 2014-07-29 09:33:53 UTC
mfrom: (425 devel)
mto: This revision was merged to the branch mainline in revision 427.
Revision ID: michi.henning@canonical.com-20140729093353-ndu77ndikxqtaqsc

Merged devel and fixed conflicts.

files added:
debian/tests/scopetest.cpp

include/unity/scopes/AbstractScopeBase.h

include/unity/scopes/CompletionDetails.h

include/unity/scopes/OperationInfo.h

include/unity/scopes/internal/CompletionDetailsImpl.h

include/unity/scopes/internal/OperationInfoImpl.h

src/scopes/CompletionDetails.cpp

src/scopes/OperationInfo.cpp

src/scopes/internal/CompletionDetailsImpl.cpp

src/scopes/internal/OperationInfoImpl.cpp

test/autopkg

test/autopkg/CMakeLists.txt

files modified:
CONFIGFILES

HACKING

RELEASE_NOTES.md

debian/changelog

debian/libunity-scopes2.symbols

debian/tests/scopebuild

demo/click/scope-click/scope-click.cpp

demo/client.cpp

demo/scopes/scope-A/scope-A.cpp

demo/scopes/scope-B/scope-B.cpp

demo/scopes/scope-C/scope-C.cpp

demo/scopes/scope-D/scope-D.cpp

demo/scopes/scope-N/scope-N.cpp

demo/scopes/scope-S/scope-S.cpp

demo/stand-alone/stand-alone-client.cpp

doc/tutorial.dox

include/unity/scopes/ActivationListenerBase.h

include/unity/scopes/ListenerBase.h

include/unity/scopes/PreviewQueryBase.h

include/unity/scopes/Reply.h

include/unity/scopes/Runtime.h

include/unity/scopes/ScopeBase.h

include/unity/scopes/SearchListenerBase.h

include/unity/scopes/internal/DfltConfig.h.in

include/unity/scopes/internal/MWReply.h

include/unity/scopes/internal/ReplyImpl.h

include/unity/scopes/internal/ReplyObject.h

include/unity/scopes/internal/ReplyObjectBase.h

include/unity/scopes/internal/RuntimeImpl.h

include/unity/scopes/internal/ScopeBaseImpl.h

include/unity/scopes/internal/ScopeConfig.h

include/unity/scopes/internal/ScopeLoader.h

include/unity/scopes/internal/zmq_middleware/ReplyI.h

include/unity/scopes/internal/zmq_middleware/ZmqReply.h

include/unity/scopes/testing/MockPreviewReply.h

include/unity/scopes/testing/MockSearchReply.h

include/unity/scopes/testing/TypedScopeFixture.h

scoperegistry/scoperegistry.cpp

scoperunner/scoperunner.cpp

smartscopesproxy/smartscopesproxy.cpp

src/scopes/ActivationListenerBase.cpp

src/scopes/CMakeLists.txt

src/scopes/ListenerBase.cpp

src/scopes/ScopeBase.cpp

src/scopes/internal/ActivationQueryObject.cpp

src/scopes/internal/CMakeLists.txt

src/scopes/internal/PreviewQueryObject.cpp

src/scopes/internal/QueryCtrlImpl.cpp

src/scopes/internal/QueryObject.cpp

src/scopes/internal/RegistryConfig.cpp

src/scopes/internal/RegistryObject.cpp

src/scopes/internal/ReplyImpl.cpp

src/scopes/internal/ReplyObject.cpp

src/scopes/internal/RuntimeConfig.cpp

src/scopes/internal/RuntimeImpl.cpp

src/scopes/internal/ScopeBaseImpl.cpp

src/scopes/internal/ScopeConfig.cpp

src/scopes/internal/ScopeImpl.cpp

src/scopes/internal/ScopeLoader.cpp

src/scopes/internal/ScopeObject.cpp

src/scopes/internal/smartscopes/SSQueryObject.cpp

src/scopes/internal/smartscopes/SSScopeObject.cpp

src/scopes/internal/zmq_middleware/ReplyI.cpp

src/scopes/internal/zmq_middleware/ZmqConfig.cpp

src/scopes/internal/zmq_middleware/ZmqReply.cpp

src/scopes/internal/zmq_middleware/capnproto/Reply.capnp

src/scopes/testing/InProcessBenchmark.cpp

test/CMakeLists.txt

test/gtest/scopes/Activation/Activation_test.cpp

test/gtest/scopes/Activation/TestScope.h

test/gtest/scopes/Filters/Filters_test.cpp

test/gtest/scopes/IdleShutdown/IdleShutdown_test.cpp

test/gtest/scopes/IdleShutdown/SlowSearchScope.cpp

test/gtest/scopes/IdleShutdown/SlowSearchScope.h

test/gtest/scopes/Invocation/Invocation_test.cpp

test/gtest/scopes/Registry/Registry_test.cpp

test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.cpp

test/gtest/scopes/Registry/scopes/testscopeB/testscopeB.cpp

test/gtest/scopes/Runtime/PusherScope.cpp

test/gtest/scopes/Runtime/PusherScope.h

test/gtest/scopes/Runtime/Runtime_test.cpp

test/gtest/scopes/Runtime/SlowCreateScope.h

test/gtest/scopes/Runtime/TestScope.cpp

test/gtest/scopes/ScopeBase/ScopeBase_test.cpp

test/gtest/scopes/ScopeBase/scopelib.cpp

test/gtest/scopes/internal/ResultReplyObject/ResultReplyObject_test.cpp

test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp

test/gtest/scopes/internal/ScopeConfig/complete_config.ini.in

test/gtest/scopes/internal/ScopeLoader/MyScope.h

test/gtest/scopes/internal/ScopeLoader/ScopeA.cpp

test/gtest/scopes/internal/ScopeLoader/ScopeB.cpp

test/gtest/scopes/internal/ScopeLoader/ScopeLoader_test.cpp

test/gtest/scopes/internal/ScopeLoader/ThrowUnityExFromStart.cpp

test/gtest/scopes/internal/ScopeLoader/ThrowUnknownExFromStart.cpp

test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp

test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp

test/gtest/scopes/testing/IsolatedScope/IsolatedScope_test.cpp

test/gtest/scopes/testing/IsolatedScope/scope.cpp

test/gtest/scopes/testing/IsolatedScope/scope.h

test/gtest/scopes/testing/IsolatedScopeBenchmark/IsolatedScopeBenchmark_test.cpp

test/gtest/scopes/testing/IsolatedScopeBenchmark/scope.cpp

test/gtest/scopes/testing/IsolatedScopeBenchmark/scope.h

test/headers/CMakeLists.txt

test/headers/check_public_headers.py

Show diffs side-by-side

added added

removed removed

RELEASE_NOTES.md

debian/changelog

debian/libunity-scopes2.symbols

debian/tests/scopebuild

debian/tests/scopetest.cpp

demo/click/scope-click/scope-click.cpp

demo/client.cpp

demo/scopes/scope-A/scope-A.cpp

demo/scopes/scope-B/scope-B.cpp

demo/scopes/scope-C/scope-C.cpp

demo/scopes/scope-D/scope-D.cpp

demo/scopes/scope-N/scope-N.cpp

demo/scopes/scope-S/scope-S.cpp

demo/stand-alone/stand-alone-client.cpp

doc/tutorial.dox

include/unity/scopes/AbstractScopeBase.h

include/unity/scopes/ActivationListenerBase.h

include/unity/scopes/CompletionDetails.h

include/unity/scopes/ListenerBase.h

include/unity/scopes/OperationInfo.h

include/unity/scopes/PreviewQueryBase.h

include/unity/scopes/Reply.h

include/unity/scopes/Runtime.h

include/unity/scopes/ScopeBase.h

include/unity/scopes/SearchListenerBase.h

include/unity/scopes/internal/CompletionDetailsImpl.h

include/unity/scopes/internal/DfltConfig.h.in

include/unity/scopes/internal/MWReply.h

include/unity/scopes/internal/OperationInfoImpl.h

include/unity/scopes/internal/ReplyImpl.h

include/unity/scopes/internal/ReplyObject.h

include/unity/scopes/internal/ReplyObjectBase.h

include/unity/scopes/internal/RuntimeImpl.h

include/unity/scopes/internal/ScopeBaseImpl.h

include/unity/scopes/internal/ScopeConfig.h

include/unity/scopes/internal/ScopeLoader.h

include/unity/scopes/internal/zmq_middleware/ReplyI.h

include/unity/scopes/internal/zmq_middleware/ZmqReply.h

include/unity/scopes/testing/MockPreviewReply.h

include/unity/scopes/testing/MockSearchReply.h

include/unity/scopes/testing/TypedScopeFixture.h

scoperegistry/scoperegistry.cpp

scoperunner/scoperunner.cpp

smartscopesproxy/smartscopesproxy.cpp

src/scopes/ActivationListenerBase.cpp

src/scopes/CMakeLists.txt

src/scopes/CompletionDetails.cpp

src/scopes/ListenerBase.cpp

src/scopes/OperationInfo.cpp

src/scopes/ScopeBase.cpp

src/scopes/internal/ActivationQueryObject.cpp

src/scopes/internal/CMakeLists.txt

src/scopes/internal/CompletionDetailsImpl.cpp

src/scopes/internal/OperationInfoImpl.cpp

src/scopes/internal/PreviewQueryObject.cpp

src/scopes/internal/QueryCtrlImpl.cpp

src/scopes/internal/QueryObject.cpp

src/scopes/internal/RegistryConfig.cpp

src/scopes/internal/RegistryObject.cpp

src/scopes/internal/ReplyImpl.cpp

src/scopes/internal/ReplyObject.cpp

src/scopes/internal/RuntimeConfig.cpp

src/scopes/internal/RuntimeImpl.cpp

src/scopes/internal/ScopeBaseImpl.cpp

src/scopes/internal/ScopeConfig.cpp

src/scopes/internal/ScopeImpl.cpp

src/scopes/internal/ScopeLoader.cpp

src/scopes/internal/ScopeObject.cpp

src/scopes/internal/smartscopes/SSQueryObject.cpp

src/scopes/internal/smartscopes/SSScopeObject.cpp

src/scopes/internal/zmq_middleware/ReplyI.cpp

src/scopes/internal/zmq_middleware/ZmqConfig.cpp

src/scopes/internal/zmq_middleware/ZmqReply.cpp

src/scopes/internal/zmq_middleware/capnproto/Reply.capnp

src/scopes/testing/InProcessBenchmark.cpp

test/CMakeLists.txt

test/autopkg/CMakeLists.txt

test/gtest/scopes/Activation/Activation_test.cpp

test/gtest/scopes/Activation/TestScope.h

test/gtest/scopes/Filters/Filters_test.cpp

test/gtest/scopes/IdleShutdown/IdleShutdown_test.cpp

test/gtest/scopes/IdleShutdown/SlowSearchScope.cpp

test/gtest/scopes/IdleShutdown/SlowSearchScope.h

test/gtest/scopes/Invocation/Invocation_test.cpp

test/gtest/scopes/Registry/Registry_test.cpp

test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.cpp

test/gtest/scopes/Registry/scopes/testscopeB/testscopeB.cpp

test/gtest/scopes/Runtime/PusherScope.cpp

test/gtest/scopes/Runtime/PusherScope.h

test/gtest/scopes/Runtime/Runtime_test.cpp

test/gtest/scopes/Runtime/SlowCreateScope.h

test/gtest/scopes/Runtime/TestScope.cpp

test/gtest/scopes/ScopeBase/ScopeBase_test.cpp

test/gtest/scopes/ScopeBase/scopelib.cpp

test/gtest/scopes/internal/ResultReplyObject/ResultReplyObject_test.cpp

test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp

test/gtest/scopes/internal/ScopeConfig/complete_config.ini.in

test/gtest/scopes/internal/ScopeLoader/MyScope.h

test/gtest/scopes/internal/ScopeLoader/ScopeA.cpp

test/gtest/scopes/internal/ScopeLoader/ScopeB.cpp

test/gtest/scopes/internal/ScopeLoader/ScopeLoader_test.cpp

test/gtest/scopes/internal/ScopeLoader/ThrowUnityExFromStart.cpp

test/gtest/scopes/internal/ScopeLoader/ThrowUnknownExFromStart.cpp

test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp

test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp

test/gtest/scopes/testing/IsolatedScope/IsolatedScope_test.cpp

test/gtest/scopes/testing/IsolatedScope/scope.cpp

test/gtest/scopes/testing/IsolatedScope/scope.h

test/gtest/scopes/testing/IsolatedScopeBenchmark/IsolatedScopeBenchmark_test.cpp

test/gtest/scopes/testing/IsolatedScopeBenchmark/scope.cpp

test/gtest/scopes/testing/IsolatedScopeBenchmark/scope.h

test/headers/CMakeLists.txt

test/headers/check_public_headers.py

Older »