3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-11 16:00:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix merge conflicts

Browse source
This commit is contained in:
Lipu Fei 2018-04-17 11:30:23 +02:00
commit 7b20ce856e
57 changed files with 3058 additions and 3542 deletions
Download patch file Download diff file Expand all files Collapse all files

10
resources/qml/Cura.qml
View file

@ -822,6 +822,16 @@ UM.MainWindow
id: askOpenAsProjectOrModelsDialog
}
Connections
{
target: CuraApplication
onOpenProjectFile:
{
askOpenAsProjectOrModelsDialog.fileUrl = project_file;
askOpenAsProjectOrModelsDialog.show();
}
}
EngineLog
{
id: engineLog;