Cura/resources/qml
Ghostkeeper 1d7792861d
Merge branch '3.0'
Conflict in ClusterControlItem.qml where there was a new element in Master that wasn't present in 3.0. That element wasn't referenced anywhere else so I just removed it.
2017-10-02 17:40:24 +02:00
..
Menus Merge branch 'fix_multiple_extruder_issues' of github.com:Ultimaker/Cura into 3.0 2017-09-29 15:17:11 +02:00
Preferences Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Settings Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
AboutDialog.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Actions.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
AddMachineDialog.qml Fixed code style and machine default name is retrieved from machine definition 2017-09-29 13:52:00 +02:00
AskOpenAsProjectOrModelsDialog.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Cura.qml Merge pull request #2530 from Ultimaker/CL-457_cura_connect_visual 2017-10-02 14:40:13 +02:00
DiscardOrKeepProfileChangesDialog.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
EngineLog.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
ExtruderButton.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
JobSpecs.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
MachineAction.qml T466: Revert the previous commit since it messed up the file rights. 2016-12-23 15:53:15 -05:00
MonitorButton.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
OpenFilesIncludingProjectsDialog.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
PrintMonitor.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
SaveButton.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Sidebar.qml Merge branch '3.0' 2017-09-28 13:01:10 +02:00
SidebarAdvanced.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
SidebarContents.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
SidebarHeader.qml Merge branch 'fix_multiple_extruder_issues' of github.com:Ultimaker/Cura into 3.0 2017-09-29 15:17:11 +02:00
SidebarSimple.qml Minor codestyle refactor 2017-10-02 14:19:44 +02:00
SidebarTooltip.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Toolbar.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Topbar.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
WorkspaceSummaryDialog.qml Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00