← Back to branch summary

~gerboland/unity-api/appManVersion2

~gerboland/unity-api/appManVersion2

Viewing all changes in revision 147.

Committer: Gerry Boland
Date: 2014-06-19 11:35:44 UTC
mfrom: (129.1.8 unity-api)
Revision ID: gerry.boland@canonical.com-20140619113544-80qy9ijvv91tpxe1

Merge trunk

files added:
include/unity/shell/scopes

include/unity/shell/scopes/CMakeLists.txt

include/unity/shell/scopes/CategoriesInterface.h

include/unity/shell/scopes/PreviewModelInterface.h

include/unity/shell/scopes/PreviewStackInterface.h

include/unity/shell/scopes/PreviewWidgetModelInterface.h

include/unity/shell/scopes/ResultsModelInterface.h

include/unity/shell/scopes/ScopeInterface.h

include/unity/shell/scopes/ScopesInterface.h

test/qmltest/mocks/plugins/Unity/Scopes

test/qmltest/mocks/plugins/Unity/Scopes/CMakeLists.txt

test/qmltest/mocks/plugins/Unity/Scopes/Mocks

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockCategories.cpp

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockCategories.h

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockPreviewModel.cpp

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockPreviewModel.h

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockPreviewStack.cpp

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockPreviewStack.h

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockPreviewWidgetModel.cpp

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockPreviewWidgetModel.h

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockResultsModel.cpp

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockResultsModel.h

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.cpp

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.h

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.cpp

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.h

test/qmltest/mocks/plugins/Unity/Scopes/TestScopesPlugin.cpp

test/qmltest/mocks/plugins/Unity/Scopes/TestScopesPlugin.h

test/qmltest/mocks/plugins/Unity/Scopes/qmldir

test/qmltest/unity/shell/scopes

test/qmltest/unity/shell/scopes/tst_Scopes.qml

files modified:
debian/changelog

include/unity/shell/CMakeLists.txt

src/unity/util/IniParser.cpp

test/qmltest/mocks/CMakeLists.txt

test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp

test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.cpp

test/qmltest/unity/shell/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

debian/changelog

include/unity/shell/CMakeLists.txt

include/unity/shell/scopes/

include/unity/shell/scopes/CMakeLists.txt

include/unity/shell/scopes/CategoriesInterface.h

include/unity/shell/scopes/PreviewModelInterface.h

include/unity/shell/scopes/PreviewStackInterface.h

include/unity/shell/scopes/PreviewWidgetModelInterface.h

include/unity/shell/scopes/ResultsModelInterface.h

include/unity/shell/scopes/ScopeInterface.h

include/unity/shell/scopes/ScopesInterface.h

src/unity/util/IniParser.cpp

test/qmltest/mocks/CMakeLists.txt

test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp

test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.cpp

test/qmltest/mocks/plugins/Unity/Scopes/

test/qmltest/mocks/plugins/Unity/Scopes/CMakeLists.txt

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockCategories.cpp

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockCategories.h

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockPreviewModel.cpp

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockPreviewModel.h

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockPreviewStack.cpp

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockPreviewStack.h

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockPreviewWidgetModel.cpp

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockPreviewWidgetModel.h

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockResultsModel.cpp

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockResultsModel.h

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.cpp

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.h

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.cpp

test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.h

test/qmltest/mocks/plugins/Unity/Scopes/TestScopesPlugin.cpp

test/qmltest/mocks/plugins/Unity/Scopes/TestScopesPlugin.h

test/qmltest/mocks/plugins/Unity/Scopes/qmldir

test/qmltest/unity/shell/CMakeLists.txt

test/qmltest/unity/shell/scopes/

test/qmltest/unity/shell/scopes/tst_Scopes.qml

Older »