Ghostkeeper de9a66e1f4 Merge branch '2.1' ... Conflicts: plugins/RemovableDriveOutputDevice/OSXRemovableDrivePlugin.py plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py plugins/USBPrinting/PrinterConnection.py resources/machines/fdmprinter.json resources/profiles/ultimaker2+/abs_0.4_high.curaprofile		2016-03-17 15:24:00 +01:00
..
__init__.py	adds/adapts translation context markers	2015-09-08 15:26:49 +02:00
Cura.proto	Fixed merge issues & updated proto files	2016-02-02 11:25:10 +01:00
CuraEngineBackend.py	Merge branch '2.1'	2016-03-17 15:24:00 +01:00
ProcessGCodeJob.py	Added documentation	2015-09-17 14:50:52 +02:00
ProcessSlicedObjectListJob.py	Corrections in plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py	2016-03-15 12:32:40 +01:00
StartSliceJob.py	Merge branch '2.1'	2016-03-17 15:24:00 +01:00