Jaime van Kessel 22feb03d88 Merge branch 'master' of https://github.com/Ultimaker/Cura

2015-08-28 11:44:28 +02:00

..

WizardPages

Code style & switch to translation catalog

2015-08-27 16:04:02 +02:00

AboutDialog.qml

Code style & switch to translation catalog

2015-08-27 16:04:02 +02:00

Actions.qml

Code style & switch to translation catalog

2015-08-27 16:04:02 +02:00

AddMachineWizard.qml

Code style & switch to translation catalog

2015-08-27 16:04:02 +02:00

Cura.qml

Fixed merge issues

2015-08-27 16:09:42 +02:00

EngineLog.qml

Code style & switch to translation catalog

2015-08-27 16:04:02 +02:00

GeneralPage.qml

Code style & switch to translation catalog

2015-08-27 16:04:02 +02:00

SaveButton.qml

Merging of mine and Jaimes work

2015-08-28 10:15:17 +02:00

Sidebar.qml

Fixed merge issues

2015-08-27 16:09:42 +02:00

SidebarAdvanced.qml

Save the state of collapsed/expanded categories

2015-06-09 13:38:23 +02:00

SidebarHeader.qml

Code style & switch to translation catalog

2015-08-27 16:04:02 +02:00

SidebarSimple.qml

Code style & switch to translation catalog

2015-08-27 16:04:02 +02:00

SidebarTooltip.qml

Position the setting tooltip to the left of the settings instead of below

2015-05-27 15:37:32 +02:00

Toolbar.qml

15.10 re-alignment of the toolbar

2015-08-27 14:59:33 +02:00

ViewPage.qml

Added missing )

2015-08-28 11:44:19 +02:00