← Back to branch summary

~marcustomlinson/unity-scopes-api/lp-1410125-rtm

~marcustomlinson/unity-scopes-api/lp-1410125-rtm

Viewing all changes in revision 261.

Committer: Marcus Tomlinson
Date: 2015-01-23 12:17:59 UTC
Revision ID: marcus.tomlinson@canonical.com-20150123121759-8g4solol1yd5krf9

Merged trunk rev.163.362.51 (Fixed JsonSettingsSchema_test)

files modified:
src/scopes/internal/JsonCppNode.cpp

src/scopes/internal/JsonSettingsSchema.cpp

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

Show diffs side-by-side

added added

removed removed

src/scopes/internal/JsonCppNode.cpp

src/scopes/internal/JsonSettingsSchema.cpp

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

Older »