« back to all changes in this revision
Viewing changes to plugins/bluetooth/CMakeLists.txt
- Committer: Ken VanDine
- Date: 2015-09-21 12:48:24 UTC
- mfrom: (1417.12.117 ubuntu-system-settings)
- Revision ID: ken.vandine@canonical.com-20150921124824-c5y02nt77yuun7tr
merged trunk
- files added:
- plugins/bluetooth/DevicePage.qml
- plugins/hotspot
- plugins/hotspot/plugin
- files removed:
- plugins/about/PhoneNumber.qml
- plugins/system-update/network
- files renamed:
- plugins/cellular/CustomApnEditor.qml => plugins/cellular/PageApnEditor.qml
- plugins/cellular/apn.js => plugins/cellular/apn_manager.js
- plugins/cellular/HotspotSetup.qml => plugins/hotspot/HotspotSetup.qml
- plugins/cellular/Hotspot.qml => plugins/hotspot/PageComponent.qml
- plugins/system-update/network/network.cpp => plugins/system-update/network.cpp
- plugins/system-update/network/network.h => plugins/system-update/network.h
- files modified:
- debian/changelog
added
removed
plugins/bluetooth/CMakeLists.txt
