← Back to branch summary

~allanlesage/ubuntu-system-settings/add-background-plugin-objectNames

~allanlesage/ubuntu-system-settings/add-background-plugin-objectNames

« back to all changes in this revision

Viewing changes to wizard/Unity/CMakeLists.txt

Committer: Allan LeSage
Date: 2014-06-19 15:41:16 UTC
mfrom: (685.1.57 ubuntu-system-settings)
Revision ID: allan.lesage@canonical.com-20140619154116-v0616502ygvxqp5x

Merged trunk.

files added:
debian/ubuntu-system-settings-wizard.install

po/sa.po

wizard/50-com.ubuntu.system-settings.wizard.pkla

wizard/Unity/Application/CMakeLists.txt

wizard/Unity/CMakeLists.txt

wizard/Utils

wizard/Utils/CMakeLists.txt

wizard/Utils/plugin.cpp

wizard/Utils/plugin.h

wizard/Utils/qmldir

wizard/Utils/qsortfilterproxymodelqml.cpp

wizard/Utils/qsortfilterproxymodelqml.h

wizard/qml/Components/SectionHeader.qml

wizard/ubuntu-system-settings-wizard-cleanup.conf

files removed:
tests/mocks

wizard/qml/Pages/20-wifi.qml.disabled

wizard/qml/Pages/spinner.qml

files renamed:
tests/mocks/Unity/ => wizard/Unity/

files modified:
debian/changelog

debian/control

debian/rules

debian/ubuntu-system-settings.install

plugins/security-privacy/diagnostics/diagnostics.cpp

po/sv.po

tests/tst_pagelist.cpp

wizard/CMakeLists.txt

wizard/PageList.cpp

wizard/main.cpp

wizard/qml/Pages/20-wifi.qml

wizard/qml/Pages/80-finished.qml

wizard/qml/main.qml

wizard/ubuntu-system-settings-wizard.conf

Show diffs side-by-side

added added

removed removed

wizard/Unity/CMakeLists.txt

1

add_subdirectory(Application)

Older »