Lipu Fei 94e89ad4ac Fix merge conflicts with master		2019-09-24 14:26:43 +02:00
..
__init__.py
AddPrinterPagesModel.py	Fix that you can only cancel in WizardDialog	2019-04-29 15:53:08 +02:00
CuraSplashScreen.py
MachineActionManager.py
MachineSettingsManager.py	Don't use material manager to reset material	2019-09-20 09:57:35 +02:00
ObjectsModel.py	Also connect the objectsModel to the selectionChanged signal	2019-07-22 10:27:19 +02:00
PrintInformation.py	Remove use of deprecated extruders property	2019-09-13 17:27:16 +02:00
RecommendedMode.py	Change import	2019-05-21 15:17:04 +02:00
TextManager.py
WelcomePagesModel.py	Fix that you can only cancel in WizardDialog	2019-04-29 15:53:08 +02:00
WhatsNewPagesModel.py