← Back to branch summary

~unity-api-team/unity-scopes-api/child-scopes-option

~unity-api-team/unity-scopes-api/child-scopes-option

Viewing all changes in revision 163.20.22.

Committer: Marcus Tomlinson
Date: 2014-10-08 10:58:57 UTC
mfrom: (497.1.3 devel)
mto: (497.1.5 devel)
mto: This revision was merged to the branch mainline in revision 505.
Revision ID: marcus.tomlinson@canonical.com-20141008105857-gf4ilb9ywfeaeroi

Merged devel

files added:
tools/symbol_diff.in

files modified:
HACKING

STRUCTS

debian/changelog

debian/control

debian/libunity-scopes3.symbols

include/unity/scopes/internal/smartscopes/HttpClientInterface.h

include/unity/scopes/internal/smartscopes/HttpClientQt.h

include/unity/scopes/internal/smartscopes/HttpClientQtThread.h

include/unity/scopes/internal/smartscopes/SmartScopesClient.h

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

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

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

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

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

src/scopes/internal/RegistryObject.cpp

src/scopes/internal/smartscopes/HttpClientQt.cpp

src/scopes/internal/smartscopes/HttpClientQtThread.cpp

src/scopes/internal/smartscopes/SmartScope.cpp

src/scopes/internal/smartscopes/SmartScopesClient.cpp

src/scopes/internal/zmq_middleware/ConnectionPool.cpp

src/scopes/internal/zmq_middleware/ObjectAdapter.cpp

src/scopes/internal/zmq_middleware/ZmqObject.cpp

src/scopes/internal/zmq_middleware/ZmqRegistry.cpp

src/scopes/internal/zmq_middleware/ZmqScope.cpp

src/scopes/internal/zmq_middleware/ZmqSender.cpp

test/gtest/scopes/Registry/Registry_test.cpp

test/gtest/scopes/internal/ThreadPool/ThreadPool_test.cpp

test/gtest/scopes/internal/smartscopes/SmartScopesClient/FakeSss.py

test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp

test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp

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

test/headers/compile_headers.py

tools/CMakeLists.txt

valgrind-suppress

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/libunity-scopes3.symbols

include/unity/scopes/internal/smartscopes/HttpClientInterface.h

include/unity/scopes/internal/smartscopes/HttpClientQt.h

include/unity/scopes/internal/smartscopes/HttpClientQtThread.h

include/unity/scopes/internal/smartscopes/SmartScopesClient.h

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

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

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

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

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

src/scopes/internal/RegistryObject.cpp

src/scopes/internal/smartscopes/HttpClientQt.cpp

src/scopes/internal/smartscopes/HttpClientQtThread.cpp

src/scopes/internal/smartscopes/SmartScope.cpp

src/scopes/internal/smartscopes/SmartScopesClient.cpp

src/scopes/internal/zmq_middleware/ConnectionPool.cpp

src/scopes/internal/zmq_middleware/ObjectAdapter.cpp

src/scopes/internal/zmq_middleware/ZmqObject.cpp

src/scopes/internal/zmq_middleware/ZmqRegistry.cpp

src/scopes/internal/zmq_middleware/ZmqScope.cpp

src/scopes/internal/zmq_middleware/ZmqSender.cpp

test/gtest/scopes/Registry/Registry_test.cpp

test/gtest/scopes/internal/ThreadPool/ThreadPool_test.cpp

test/gtest/scopes/internal/smartscopes/SmartScopesClient/FakeSss.py

test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp

test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp

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

test/headers/compile_headers.py

tools/CMakeLists.txt

tools/symbol_diff.in

valgrind-suppress

Older »