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

..

3MFReader

Merge branch '3.0'

2017-10-02 17:40:24 +02:00

3MFWriter

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

AutoSave

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

ChangeLogPlugin

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

CuraEngineBackend

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

CuraProfileReader

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

CuraProfileWriter

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

FirmwareUpdateChecker

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

GCodeProfileReader

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

GCodeReader

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

GCodeWriter

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

ImageReader

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

LayerView

Fix width of the layerview layer box

2017-10-02 14:49:29 +02:00

LegacyProfileReader

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

MachineSettingsAction

Merge branch 'fix_multiple_extruder_issues' of github.com:Ultimaker/Cura into 3.0

2017-09-29 15:17:11 +02:00

PerObjectSettingsTool

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

PluginBrowser

Merge branch '3.0'

2017-09-28 13:01:10 +02:00

RemovableDriveOutputDevice

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

SliceInfoPlugin

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

SolidView

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

UltimakerMachineActions

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

UM3NetworkPrinting

Merge branch '3.0'

2017-10-02 17:40:24 +02:00

USBPrinting

Merge branch '3.0'

2017-09-28 13:01:10 +02:00

VersionUpgrade

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

X3DReader

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

XmlMaterialProfile

XML materials are now added in one batch

2017-09-28 16:07:03 +02:00

XRayView

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00