← 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 449.2.2.

Committer: Michi Henning
Date: 2014-09-02 01:40:03 UTC
mfrom: (473 devel)
mto: This revision was merged to the branch mainline in revision 478.
Revision ID: michi.henning@canonical.com-20140902014003-i54v0jiua42bfjnh

Merged devel and resolved conflicts.

files added:
src/scopes/internal/smartscopes/SmartScope.cpp

test/gtest/scopes/internal/RuntimeImpl/TestScope_TestScope.ini.in

test/gtest/scopes/internal/SettingsDB/db_empty.ini

test/gtest/scopes/internal/SettingsDB/db_location.ini

test/gtest/scopes/internal/SettingsDB/db_location_json.ini

test/gtest/scopes/internal/SettingsDB/db_location_munich.ini

test/gtest/scopes/internal/SettingsDB/db_loctemp.ini

test/gtest/scopes/internal/SettingsDB/db_loctemp_bad_age.ini

test/gtest/scopes/internal/SettingsDB/db_loctempage.ini

test/gtest/scopes/internal/SettingsDB/db_loctempageenabled.ini

test/gtest/scopes/internal/SettingsDB/db_unknown_setting.ini

files removed:
test/gtest/scopes/internal/SettingsDB/add_doc.py

files modified:
CMakeLists.txt

CONFIGFILES

RELEASE_NOTES.md

debian/changelog

debian/control

debian/libunity-scopes3.symbols

debian/tests/scopebuild

debian/tests/scopetest.cpp

demo/client.cpp

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

doc/tutorial.dox

include/unity/scopes/PreviewWidget.h

include/unity/scopes/ScopeExceptions.h

include/unity/scopes/internal/PreviewWidgetImpl.h

include/unity/scopes/internal/RegistryObject.h

include/unity/scopes/internal/SettingsDB.h

include/unity/scopes/internal/Utils.h

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

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

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

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

scoperegistry/scoperegistry.cpp

scoperunner/scoperunner.cpp

src/scopes/PreviewWidget.cpp

src/scopes/ScopeExceptions.cpp

src/scopes/internal/CannedQueryImpl.cpp

src/scopes/internal/DynamicLoader.cpp

src/scopes/internal/IniSettingsSchema.cpp

src/scopes/internal/JsonCppNode.cpp

src/scopes/internal/JsonSettingsSchema.cpp

src/scopes/internal/PreviewWidgetImpl.cpp

src/scopes/internal/RegistryObject.cpp

src/scopes/internal/RuntimeImpl.cpp

src/scopes/internal/ScopeMetadataImpl.cpp

src/scopes/internal/SettingsDB.cpp

src/scopes/internal/Utils.cpp

src/scopes/internal/smartscopes/CMakeLists.txt

src/scopes/internal/smartscopes/HttpClientQtThread.cpp

src/scopes/internal/smartscopes/SSQueryObject.cpp

src/scopes/internal/smartscopes/SSRegistryObject.cpp

src/scopes/internal/smartscopes/SSScopeObject.cpp

src/scopes/internal/smartscopes/SmartScopesClient.cpp

src/scopes/internal/zmq_middleware/Util.cpp

src/scopes/internal/zmq_middleware/ZmqException.cpp

src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp

test/gtest/scopes/CannedQuery/CannedQuery_test.cpp

test/gtest/scopes/PreviewWidget/PreviewWidget_test.cpp

test/gtest/scopes/Registry/CMakeLists.txt

test/gtest/scopes/Registry/Registry_test.cpp

test/gtest/scopes/internal/IniSettingsSchema/IniSettingsSchema_test.cpp

test/gtest/scopes/internal/JsonSettingsSchema/JsonSettingsSchema_test.cpp

test/gtest/scopes/internal/RuntimeImpl/CMakeLists.txt

test/gtest/scopes/internal/RuntimeImpl/RuntimeImpl_test.cpp

test/gtest/scopes/internal/RuntimeImpl/TestScope.ini.in

test/gtest/scopes/internal/SettingsDB/SettingsDB_test.cpp

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

Show diffs side-by-side

added added

removed removed

RELEASE_NOTES.md

debian/changelog

debian/libunity-scopes3.symbols

debian/tests/scopebuild

debian/tests/scopetest.cpp

demo/client.cpp

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

doc/tutorial.dox

include/unity/scopes/PreviewWidget.h

include/unity/scopes/ScopeExceptions.h

include/unity/scopes/internal/PreviewWidgetImpl.h

include/unity/scopes/internal/RegistryObject.h

include/unity/scopes/internal/SettingsDB.h

include/unity/scopes/internal/Utils.h

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

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

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

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

scoperegistry/scoperegistry.cpp

scoperunner/scoperunner.cpp

src/scopes/PreviewWidget.cpp

src/scopes/ScopeExceptions.cpp

src/scopes/internal/CannedQueryImpl.cpp

src/scopes/internal/DynamicLoader.cpp

src/scopes/internal/IniSettingsSchema.cpp

src/scopes/internal/JsonCppNode.cpp

src/scopes/internal/JsonSettingsSchema.cpp

src/scopes/internal/PreviewWidgetImpl.cpp

src/scopes/internal/RegistryObject.cpp

src/scopes/internal/RuntimeImpl.cpp

src/scopes/internal/ScopeMetadataImpl.cpp

src/scopes/internal/SettingsDB.cpp

src/scopes/internal/Utils.cpp

src/scopes/internal/smartscopes/CMakeLists.txt

src/scopes/internal/smartscopes/HttpClientQtThread.cpp

src/scopes/internal/smartscopes/SSQueryObject.cpp

src/scopes/internal/smartscopes/SSRegistryObject.cpp

src/scopes/internal/smartscopes/SSScopeObject.cpp

src/scopes/internal/smartscopes/SmartScope.cpp

src/scopes/internal/smartscopes/SmartScopesClient.cpp

src/scopes/internal/zmq_middleware/Util.cpp

src/scopes/internal/zmq_middleware/ZmqException.cpp

src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp

test/gtest/scopes/CannedQuery/CannedQuery_test.cpp

test/gtest/scopes/PreviewWidget/PreviewWidget_test.cpp

test/gtest/scopes/Registry/CMakeLists.txt

test/gtest/scopes/Registry/Registry_test.cpp

test/gtest/scopes/internal/IniSettingsSchema/IniSettingsSchema_test.cpp

test/gtest/scopes/internal/JsonSettingsSchema/JsonSettingsSchema_test.cpp

test/gtest/scopes/internal/RuntimeImpl/CMakeLists.txt

test/gtest/scopes/internal/RuntimeImpl/RuntimeImpl_test.cpp

test/gtest/scopes/internal/RuntimeImpl/TestScope.ini.in

test/gtest/scopes/internal/RuntimeImpl/TestScope_TestScope.ini.in

test/gtest/scopes/internal/SettingsDB/SettingsDB_test.cpp

test/gtest/scopes/internal/SettingsDB/add_doc.py

test/gtest/scopes/internal/SettingsDB/db_empty.ini

test/gtest/scopes/internal/SettingsDB/db_location.ini

test/gtest/scopes/internal/SettingsDB/db_location_json.ini

test/gtest/scopes/internal/SettingsDB/db_location_munich.ini

test/gtest/scopes/internal/SettingsDB/db_loctemp.ini

test/gtest/scopes/internal/SettingsDB/db_loctemp_bad_age.ini

test/gtest/scopes/internal/SettingsDB/db_loctempage.ini

test/gtest/scopes/internal/SettingsDB/db_loctempageenabled.ini

test/gtest/scopes/internal/SettingsDB/db_unknown_setting.ini

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

Older »