← Back to branch summary

~unity-team/unity-scopes-shell/overview

~unity-team/unity-scopes-shell/overview

Viewing all changes in revision 129.

Committer: Michal Hruby
Date: 2014-07-31 11:08:50 UTC
mfrom: (108.2.4 unity-scopes-shell)
Revision ID: michal.mhr@gmail.com-20140731110850-41qkf5s8x8ugm3bj

Merge trunk

files added:
src/Unity/geoip.cpp

src/Unity/geoip.h

src/Unity/locationservice.cpp

src/Unity/locationservice.h

src/Unity/ubuntulocationservice.cpp

src/Unity/ubuntulocationservice.h

tests/geoip.ubuntu.com.py

tests/locationtest.cpp

tools/CMakeLists.txt

tools/location

tools/location/CMakeLists.txt

tools/location/main.cpp

files modified:
CMakeLists.txt

debian/changelog

debian/control

src/Unity/CMakeLists.txt

src/Unity/scope.cpp

src/Unity/scope.h

src/Unity/scopes.cpp

src/Unity/scopes.h

tests/CMakeLists.txt

tests/departmentstest.cpp

tests/previewtest.cpp

tests/registry-spawner.h

tests/resultstest.cpp

tools/settings/Settings.qml

tools/settings/widgets/booleanSettingsWidget.qml

tools/settings/widgets/listSettingsWidget.qml

tools/settings/widgets/numberSettingsWidget.qml

tools/settings/widgets/stringSettingsWidget.qml

Show diffs side-by-side

added added

removed removed

debian/changelog

src/Unity/CMakeLists.txt

src/Unity/geoip.cpp

src/Unity/geoip.h

src/Unity/locationservice.cpp

src/Unity/locationservice.h

src/Unity/scope.cpp

src/Unity/scope.h

src/Unity/scopes.cpp

src/Unity/scopes.h

src/Unity/ubuntulocationservice.cpp

src/Unity/ubuntulocationservice.h

tests/CMakeLists.txt

tests/departmentstest.cpp

tests/geoip.ubuntu.com.py

tests/locationtest.cpp

tests/previewtest.cpp

tests/registry-spawner.h

tests/resultstest.cpp

tools/CMakeLists.txt

tools/location/

tools/location/CMakeLists.txt

tools/location/main.cpp

tools/settings/Settings.qml

tools/settings/widgets/booleanSettingsWidget.qml

tools/settings/widgets/listSettingsWidget.qml

tools/settings/widgets/numberSettingsWidget.qml

tools/settings/widgets/stringSettingsWidget.qml

Older »