← Back to branch summary

~tpeeters/unity8/new_tabbar-again

~tpeeters/unity8/new_tabbar-again

Viewing all changes in revision 834.

Committer: tim.peeters at canonical
Date: 2014-04-29 14:01:36 UTC
mfrom: (832.1.22 unity8)
Revision ID: tim.peeters@canonical.com-20140429140136-8idik0b1951bzoqc

merge trunk

files added:
po/br.po

tests/qmltests/Dash/tst_CardBenchmark.qml

files removed:
qml/Components/AnimationControllerWithSignals.qml

qml/Dash/ScopeDelegateMapper.qml

tests/qmltests/Components/tst_AnimationControllerWithSignals.qml

tests/qmltests/Dash/qml

tests/qmltests/Dash/qml/FakeScopeView.qml

tests/qmltests/Dash/qml/fake_generic_scopeView.qml

tests/qmltests/Dash/qml/fake_scopeView1.qml

tests/qmltests/Dash/qml/fake_scopeView2.qml

tests/qmltests/Dash/qml/fake_scopeView3.qml

tests/qmltests/Dash/qml/fake_scopeView4.qml

files modified:
cmake/modules/QmlTest.cmake

data/unity8.conf

debian/changelog

debian/control

plugins/Unity/Indicators/CMakeLists.txt

plugins/Unity/Indicators/indicatorsmanager.cpp

plugins/Unity/Indicators/indicatorsmanager.h

po/ug.po

qml/Components/Carousel.qml

qml/Dash/Card.qml

qml/Dash/CardCarousel.qml

qml/Dash/CardFilterGrid.qml

qml/Dash/CardHeader.qml

qml/Dash/DashContent.qml

qml/Dash/GenericScopeView.qml

qml/Dash/Previews/PreviewRatingDisplay.qml

qml/Dash/Previews/PreviewRatingInput.qml

qml/Shell.qml

qml/graphics/phone_background.jpg

qml/graphics/tablet_background.jpg

run

tests/autopilot/unity8/application_lifecycle/tests/__init__.py

tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py

tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py

tests/autopilot/unity8/process_helpers.py

tests/autopilot/unity8/shell/emulators/dash.py

tests/autopilot/unity8/shell/tests/test_emulators.py

tests/autopilot/unity8/shell/tests/test_notifications.py

tests/qmltests/CMakeLists.txt

tests/qmltests/Components/tst_Carousel.qml

tests/qmltests/Dash/tst_Card.qml

tests/qmltests/Dash/tst_CardHeader.qml

tests/qmltests/Dash/tst_Dash.qml

tests/qmltests/Dash/tst_DashContent.qml

tests/qmltests/Dash/tst_GenericScopeView.qml

tests/qmltests/Launcher/tst_Launcher.qml

tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml

tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml

tests/qmltests/tst_Shell.qml

Show diffs side-by-side

added added

removed removed

cmake/modules/QmlTest.cmake

data/unity8.conf

debian/changelog

plugins/Unity/Indicators/CMakeLists.txt

plugins/Unity/Indicators/indicatorsmanager.cpp

plugins/Unity/Indicators/indicatorsmanager.h

qml/Components/AnimationControllerWithSignals.qml

qml/Components/Carousel.qml

qml/Dash/Card.qml

qml/Dash/CardCarousel.qml

qml/Dash/CardFilterGrid.qml

qml/Dash/CardHeader.qml

qml/Dash/DashContent.qml

qml/Dash/GenericScopeView.qml

qml/Dash/Previews/PreviewRatingDisplay.qml

qml/Dash/Previews/PreviewRatingInput.qml

qml/Dash/ScopeDelegateMapper.qml

qml/graphics/phone_background.jpg

qml/graphics/tablet_background.jpg

tests/autopilot/unity8/application_lifecycle/tests/__init__.py

tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py

tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py

tests/autopilot/unity8/process_helpers.py

tests/autopilot/unity8/shell/emulators/dash.py

tests/autopilot/unity8/shell/tests/test_emulators.py

tests/autopilot/unity8/shell/tests/test_notifications.py

tests/qmltests/CMakeLists.txt

tests/qmltests/Components/tst_AnimationControllerWithSignals.qml

tests/qmltests/Components/tst_Carousel.qml

tests/qmltests/Dash/qml/

tests/qmltests/Dash/qml/FakeScopeView.qml

tests/qmltests/Dash/qml/fake_generic_scopeView.qml

tests/qmltests/Dash/qml/fake_scopeView1.qml

tests/qmltests/Dash/qml/fake_scopeView2.qml

tests/qmltests/Dash/qml/fake_scopeView3.qml

tests/qmltests/Dash/qml/fake_scopeView4.qml

tests/qmltests/Dash/tst_Card.qml

tests/qmltests/Dash/tst_CardBenchmark.qml

tests/qmltests/Dash/tst_CardHeader.qml

tests/qmltests/Dash/tst_Dash.qml

tests/qmltests/Dash/tst_DashContent.qml

tests/qmltests/Dash/tst_GenericScopeView.qml

tests/qmltests/Launcher/tst_Launcher.qml

tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml

tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml

tests/qmltests/tst_Shell.qml

Older »