← Back to branch summary

~ps-jenkins/unity-scopes-shell/ubuntu-rtm-14.09-proposed

~ps-jenkins/unity-scopes-shell/ubuntu-rtm-14.09-proposed

Viewing all changes in revision 130.

Committer: Pawel Stolowski
Date: 2014-11-05 15:58:30 UTC
mfrom: (124.3.39 unity-scopes-shell)
Revision ID: pawel.stolowski@canonical.com-20141105155830-t3koenxjpe5z0tf3

Merged trunk.

files added:
tests/data/mock-scope-departments-flipflop

tests/data/mock-scope-departments-flipflop/CMakeLists.txt

tests/data/mock-scope-departments-flipflop/mock-scope-departments-flipflop.cpp

tests/data/mock-scope-departments-flipflop/mock-scope-departments-flipflop.ini.in

tests/favoritestest.cpp

tests/registry-spawner.h

tests/test-utils.h

files renamed:
tests/registry-spawner.h => tests/registry-spawner.cpp

tests/test-utils.h => tests/test-utils.cpp

files modified:
cmake/modules/Plugins.cmake

debian/changelog

debian/control

src/Unity/CMakeLists.txt

src/Unity/geoip.h

src/Unity/locationservice.h

src/Unity/overviewcategories.cpp

src/Unity/overviewcategories.h

src/Unity/overviewresults.cpp

src/Unity/overviewscope.cpp

src/Unity/overviewscope.h

src/Unity/previewmodel.cpp

src/Unity/previewmodel.h

src/Unity/previewstack.cpp

src/Unity/previewstack.h

src/Unity/resultsmodel.cpp

src/Unity/scope.cpp

src/Unity/scope.h

src/Unity/scopes.cpp

src/Unity/scopes.h

src/Unity/settingsmodel.cpp

src/Unity/ubuntulocationservice.cpp

src/Unity/ubuntulocationservice.h

src/Unity/utils.cpp

src/Unity/utils.h

tests/CMakeLists.txt

tests/data/CMakeLists.txt

tests/data/mock-scope/mock-scope.cpp

tests/departmentstest.cpp

tests/locationtest.cpp

tests/overviewtest.cpp

tests/previewtest.cpp

tests/resultstest.cpp

tests/settingsendtoendtest.cpp

Show diffs side-by-side

added added

removed removed

cmake/modules/Plugins.cmake

debian/changelog

src/Unity/CMakeLists.txt

src/Unity/geoip.h

src/Unity/locationservice.h

src/Unity/overviewcategories.cpp

src/Unity/overviewcategories.h

src/Unity/overviewresults.cpp

src/Unity/overviewscope.cpp

src/Unity/overviewscope.h

src/Unity/previewmodel.cpp

src/Unity/previewmodel.h

src/Unity/previewstack.cpp

src/Unity/previewstack.h

src/Unity/resultsmodel.cpp

src/Unity/scope.cpp

src/Unity/scope.h

src/Unity/scopes.cpp

src/Unity/scopes.h

src/Unity/settingsmodel.cpp

src/Unity/ubuntulocationservice.cpp

src/Unity/ubuntulocationservice.h

src/Unity/utils.cpp

src/Unity/utils.h

tests/CMakeLists.txt

tests/data/CMakeLists.txt

tests/data/mock-scope-departments-flipflop/

tests/data/mock-scope-departments-flipflop/CMakeLists.txt

tests/data/mock-scope-departments-flipflop/mock-scope-departments-flipflop.cpp

tests/data/mock-scope-departments-flipflop/mock-scope-departments-flipflop.ini.in

tests/data/mock-scope/mock-scope.cpp

tests/departmentstest.cpp

tests/favoritestest.cpp

tests/locationtest.cpp

tests/overviewtest.cpp

tests/previewtest.cpp

tests/registry-spawner.cpp

tests/registry-spawner.h

tests/resultstest.cpp

tests/settingsendtoendtest.cpp

tests/test-utils.cpp

tests/test-utils.h

Older »