← Back to branch summary

~cimi/ubuntu-system-settings/wizard.privacy

~cimi/ubuntu-system-settings/wizard.privacy

Viewing all changes in revision 667.

Committer: Andrea Cimitan
Date: 2014-03-27 15:32:39 UTC
mfrom: (662.2.15 wizard.wifi)
Revision ID: andrea.cimitan@gmail.com-20140327153239-7kpiqyq0ra92xj2u

Merged wifi branch

files added:
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

files removed:
wizard/qml/Pages/20-wifi.qml.disabled

files modified:
wizard/CMakeLists.txt

wizard/main.cpp

wizard/qml/Pages/20-wifi.qml

wizard/ubuntu-system-settings-wizard.conf

Show diffs side-by-side

added added

removed removed

wizard/CMakeLists.txt

wizard/Utils/CMakeLists.txt

wizard/Utils/plugin.cpp

wizard/Utils/plugin.h

wizard/Utils/qmldir

wizard/Utils/qsortfilterproxymodelqml.cpp

wizard/Utils/qsortfilterproxymodelqml.h

wizard/main.cpp

wizard/qml/Components/SectionHeader.qml

wizard/qml/Pages/20-wifi.qml

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

wizard/ubuntu-system-settings-wizard.conf

Older »