← Back to branch summary

~saviq/unity8/packaging-and-cleanup

~saviq/unity8/packaging-and-cleanup

Viewing all changes in revision 615.

Committer: Michał Sawicz
Date: 2014-01-28 09:11:25 UTC
mfrom: (610.1.43 unity8)
Revision ID: michal.sawicz@canonical.com-20140128091125-f2x24mr7ve9i67p4

Merge trunk.

files added:
plugins/DashViews/organicgrid.cpp

plugins/DashViews/organicgrid.h

po/am.po

po/bs.po

po/ckb.po

po/da.po

po/eu.po

po/hi.po

po/lt.po

po/mr.po

po/ms.po

po/pt.po

po/sq.po

po/sw.po

po/vi.po

po/zh_HK.po

tests/plugins/DashViews/organicgridtest.cpp

tests/plugins/DashViews/organicgridtest.qml

tests/plugins/DashViews/organicgridtry.cpp

tests/plugins/DashViews/organicgridtry.qml

files renamed:
plugins/DashViews/abstractjournal.cpp => plugins/DashViews/abstractdashview.cpp

plugins/DashViews/abstractjournal.h => plugins/DashViews/abstractdashview.h

files modified:
data/unity8.conf

debian/control

debian/unity8-fake-env.install

plugins/DashViews/CMakeLists.txt

plugins/DashViews/horizontaljournal.cpp

plugins/DashViews/horizontaljournal.h

plugins/DashViews/plugin.cpp

plugins/DashViews/verticaljournal.cpp

plugins/DashViews/verticaljournal.h

po/az.po

po/de.po

po/el.po

po/en_GB.po

po/es.po

po/fo.po

po/fr.po

po/hu.po

po/it.po

po/ja.po

po/nl.po

po/pt_BR.po

po/ru.po

po/tr.po

po/ug.po

po/zh_TW.po

qml/Dash/Apps/AppPreview.qml

qml/Panel/IndicatorRow.qml

qml/Panel/Indicators.qml

qml/Panel/MenuContent.qml

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

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

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

tests/mocks/LightDM/CMakeLists.txt

tests/mocks/Unity/CMakeLists.txt

tests/mocks/Unity/Indicators/IndicatorsModel.qml

tests/mocks/Unity/Indicators/qml/fake_menu_widget2.qml

tests/mocks/Unity/Indicators/qml/fake_menu_widget3.qml

tests/mocks/Unity/fake_applications_scope.cpp

tests/mocks/Unity/fake_preview.cpp

tests/mocks/Unity/fake_preview.h

tests/mocks/Unity/fake_scope.cpp

tests/mocks/Unity/fake_scope.h

tests/plugins/DashViews/CMakeLists.txt

tests/plugins/DashViews/horizontaljournaltest.cpp

tests/plugins/DashViews/verticaljournaltest.cpp

tests/plugins/LightDM/CMakeLists.txt

tests/qmltests/Greeter/tst_Lockscreen.qml

tests/qmltests/Panel/tst_IndicatorRow.qml

tests/qmltests/Panel/tst_Indicators.qml

tests/qmltests/Panel/tst_MenuContent.qml

tests/qmltests/Panel/tst_Panel.qml

tests/qmltests/tst_Shell.qml

tests/utils/modules/Unity/Test/UnityTestCase.qml

Show diffs side-by-side

added added

removed removed

data/unity8.conf

debian/unity8-fake-env.install

plugins/DashViews/CMakeLists.txt

plugins/DashViews/abstractdashview.cpp

plugins/DashViews/abstractdashview.h

plugins/DashViews/horizontaljournal.cpp

plugins/DashViews/horizontaljournal.h

plugins/DashViews/organicgrid.cpp

plugins/DashViews/organicgrid.h

plugins/DashViews/plugin.cpp

plugins/DashViews/verticaljournal.cpp

plugins/DashViews/verticaljournal.h

qml/Dash/Apps/AppPreview.qml

qml/Panel/IndicatorRow.qml

qml/Panel/Indicators.qml

qml/Panel/MenuContent.qml

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

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

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

tests/mocks/LightDM/CMakeLists.txt

tests/mocks/Unity/CMakeLists.txt

tests/mocks/Unity/Indicators/IndicatorsModel.qml

tests/mocks/Unity/Indicators/qml/fake_menu_widget2.qml

tests/mocks/Unity/Indicators/qml/fake_menu_widget3.qml

tests/mocks/Unity/fake_applications_scope.cpp

tests/mocks/Unity/fake_preview.cpp

tests/mocks/Unity/fake_preview.h

tests/mocks/Unity/fake_scope.cpp

tests/mocks/Unity/fake_scope.h

tests/plugins/DashViews/CMakeLists.txt

tests/plugins/DashViews/horizontaljournaltest.cpp

tests/plugins/DashViews/organicgridtest.cpp

tests/plugins/DashViews/organicgridtest.qml

tests/plugins/DashViews/organicgridtry.cpp

tests/plugins/DashViews/organicgridtry.qml

tests/plugins/DashViews/verticaljournaltest.cpp

tests/plugins/LightDM/CMakeLists.txt

tests/qmltests/Greeter/tst_Lockscreen.qml

tests/qmltests/Panel/tst_IndicatorRow.qml

tests/qmltests/Panel/tst_Indicators.qml

tests/qmltests/Panel/tst_MenuContent.qml

tests/qmltests/Panel/tst_Panel.qml

tests/qmltests/tst_Shell.qml

tests/utils/modules/Unity/Test/UnityTestCase.qml

Older »