← Back to branch summary

~marcustomlinson/unity-scopes-shell/lp-1552082

~marcustomlinson/unity-scopes-shell/lp-1552082

Viewing all changes in revision 303.

Committer: Marcus Tomlinson
Date: 2016-03-29 06:38:28 UTC
mfrom: (295.1.5 unity-scopes-shell)
Revision ID: marcus.tomlinson@canonical.com-20160329063828-jt2mbzqdi1rj7g2t

Merge trunk

files added:
src/Unity/filters.cpp

src/Unity/filters.h

src/Unity/modelupdate.h

src/Unity/optionselectorfilter.cpp

src/Unity/optionselectorfilter.h

src/Unity/optionselectoroptions.cpp

src/Unity/optionselectoroptions.h

src/Unity/rangeinputfilter.cpp

src/Unity/rangeinputfilter.h

src/Unity/valuesliderfilter.cpp

src/Unity/valuesliderfilter.h

src/Unity/valueslidervalues.cpp

src/Unity/valueslidervalues.h

tests/data/mock-scope-filters

tests/data/mock-scope-filters/CMakeLists.txt

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

tests/data/mock-scope-filters/mock-scope-filters.ini.in

tests/filtersendtoendtest.cpp

tests/filterstest.cpp

tests/optionselectorfiltertest.cpp

files modified:
CMakeLists.txt

debian/changelog

debian/control.in

debian/libscope-harness.symbols.in

po/POTFILES.in

po/am.po

po/ar.po

po/ast.po

po/br.po

po/ca.po

po/cs.po

po/cy.po

po/da.po

po/de.po

po/el.po

po/en_AU.po

po/en_GB.po

po/eo.po

po/es.po

po/eu.po

po/fa.po

po/fi.po

po/fr.po

po/gd.po

po/gl.po

po/hu.po

po/it.po

po/ja.po

po/nb.po

po/nl.po

po/pl.po

po/pt.po

po/pt_BR.po

po/ro.po

po/ru.po

po/sl.po

po/sr.po

po/sv.po

po/ta.po

po/uk.po

po/unity-plugin-scopes.pot

po/zh_CN.po

po/zh_TW.po

src/Unity/CMakeLists.txt

src/Unity/collectors.cpp

src/Unity/collectors.h

src/Unity/department.cpp

src/Unity/department.h

src/Unity/plugin.cpp

src/Unity/scope.cpp

src/Unity/scope.h

src/Unity/utils.cpp

src/python/CMakeLists.txt

src/scope-harness/test-utils.cpp

src/scope-harness/test-utils.h

src/scope-harness/view/results-view.cpp

tests/CMakeLists.txt

tests/data/CMakeLists.txt

tests/departmentstest.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/control.in

debian/libscope-harness.symbols.in

po/unity-plugin-scopes.pot

src/Unity/CMakeLists.txt

src/Unity/collectors.cpp

src/Unity/collectors.h

src/Unity/department.cpp

src/Unity/department.h

src/Unity/filters.cpp

src/Unity/filters.h

src/Unity/modelupdate.h

src/Unity/optionselectorfilter.cpp

src/Unity/optionselectorfilter.h

src/Unity/optionselectoroptions.cpp

src/Unity/optionselectoroptions.h

src/Unity/plugin.cpp

src/Unity/rangeinputfilter.cpp

src/Unity/rangeinputfilter.h

src/Unity/scope.cpp

src/Unity/scope.h

src/Unity/utils.cpp

src/Unity/valuesliderfilter.cpp

src/Unity/valuesliderfilter.h

src/Unity/valueslidervalues.cpp

src/Unity/valueslidervalues.h

src/python/CMakeLists.txt

src/scope-harness/test-utils.cpp

src/scope-harness/test-utils.h

src/scope-harness/view/results-view.cpp

tests/CMakeLists.txt

tests/data/CMakeLists.txt

tests/data/mock-scope-filters/

tests/data/mock-scope-filters/CMakeLists.txt

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

tests/data/mock-scope-filters/mock-scope-filters.ini.in

tests/departmentstest.cpp

tests/filtersendtoendtest.cpp

tests/filterstest.cpp

tests/optionselectorfiltertest.cpp

Older »