Lipu Fei ec0b197b6e Fix merge conflicts

2019-03-22 14:28:23 +01:00

..

AddLocalPrinterScrollView.qml

Add docs for properties in AddLocalPrinterScrollView.qml

2019-03-22 09:59:07 +01:00

AddNetworkOrLocalPrinterContent.qml

Fix merge conflicts

2019-03-22 12:07:59 +01:00

AddNetworkPrinterScrollView.qml

Fix comments

2019-03-22 10:07:26 +01:00

AddPrinterByIpContent.qml

Fix merge conflicts

2019-03-22 14:28:23 +01:00

CloudContent.qml

Fix merge conflicts

2019-03-22 14:28:23 +01:00

DataCollectionsContent.qml

Fix merge conflicts

2019-03-22 14:28:23 +01:00

DropDownHeader.qml

WIP: Complete add network and local printer flow

2019-03-13 10:31:47 +01:00

DropDownWidget.qml

Use theme

2019-03-22 13:06:57 +01:00

FirstStartMachineActionsContent.qml

Fix merge conflicts

2019-03-22 12:07:59 +01:00

StepPanel.qml

Fix merge conflicts

2019-03-22 14:28:23 +01:00

UserAgreementContent.qml

Fix merge conflicts

2019-03-22 14:28:23 +01:00

WelcomeContent.qml

Fix merge conflicts

2019-03-22 14:28:23 +01:00

WelcomeDialog.qml

WIP: dos2unix new files

2019-02-28 08:07:44 +01:00

WhatsNewContent.qml

Fix merge conflicts

2019-03-22 14:28:23 +01:00