← Back to branch summary

~unity-team/unity-scopes-shell/trunk

~unity-team/unity-scopes-shell/trunk

Viewing all changes in revision 104.1.3.

Committer: Michal Hruby
Date: 2014-07-08 16:48:59 UTC
mfrom: (98.3.28 settings)
mto: This revision was merged to the branch mainline in revision 106.
Revision ID: michal.mhr@gmail.com-20140708164859-wavawmuxyekyda2r

Merge lp:~unity-api-team/unity-scopes-shell/scope-settings

files added:
src/Unity/settingsmodel.cpp

src/Unity/settingsmodel.h

tests/settingstest.cpp

tools

tools/settings

tools/settings/Settings.qml

tools/settings/run.sh

tools/settings/widgets

tools/settings/widgets/booleanSettingsWidget.qml

tools/settings/widgets/listSettingsWidget.qml

tools/settings/widgets/numberSettingsWidget.qml

tools/settings/widgets/stringSettingsWidget.qml

files modified:
debian/control

src/Unity/CMakeLists.txt

src/Unity/plugin.cpp

src/Unity/scope.cpp

src/Unity/scope.h

tests/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

src/Unity/CMakeLists.txt

src/Unity/plugin.cpp

src/Unity/scope.cpp

src/Unity/scope.h

src/Unity/settingsmodel.cpp

src/Unity/settingsmodel.h

tests/CMakeLists.txt

tests/settingstest.cpp

tools/settings/

tools/settings/Settings.qml

tools/settings/run.sh

tools/settings/widgets/

tools/settings/widgets/booleanSettingsWidget.qml

tools/settings/widgets/listSettingsWidget.qml

tools/settings/widgets/numberSettingsWidget.qml

tools/settings/widgets/stringSettingsWidget.qml

Older »