Lipu Fei 80dff49b8a Fix merge conflicts

2019-03-22 10:00:57 +01:00

..

AddLocalPrinterScrollView.qml

Add docs for properties in AddLocalPrinterScrollView.qml

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

AddNetworkPrinterScrollView.qml

Use default margin for network printer button

2019-03-21 15:53:21 +01:00

AddPrinterByIpContent.qml

Adapted to more review comments. [CURA-6294]

2019-03-20 17:20:06 +01:00

AddPrinterBySelectionContent.qml

Theme welcome_pages_button

2019-03-21 16:01:50 +01:00

CloudContent.qml

Theme welcome_pages_button

2019-03-21 16:01:50 +01:00

DataCollectionsContent.qml

Theme welcome_pages_button

2019-03-21 16:01:50 +01:00

DropDownHeader.qml

WIP: Complete add network and local printer flow

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

DropDownWidget.qml

WIP: Complete add network and local printer flow

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

FirstStartMachineActionsContent.qml

Theme welcome_pages_button

2019-03-21 16:01:50 +01:00

StepPanel.qml

WIP: Cleanup and unify MachineAction styles

2019-03-19 15:40:44 +01:00

UserAgreementContent.qml

Theme welcome_pages_button

2019-03-21 16:01:50 +01:00

WelcomeContent.qml

Theme welcome_pages_button

2019-03-21 16:01:50 +01:00

WelcomeDialog.qml

WIP: dos2unix new files

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

WhatsNewContent.qml

Theme welcome_pages_button

2019-03-21 16:01:50 +01:00