Simon Edwards fd42a43270 Merge branch 'master' into simple_convex_hull ... Conflicts: cura/BuildVolume.py cura/ConvexHullDecorator.py cura/ConvexHullJob.py cura/CuraApplication.py		2016-06-21 14:47:10 +02:00
..
__init__.py	Bump API version of plugins that do not need extra porting	2016-05-30 15:29:10 +02:00
ConfigUI.qml	Fix color of some texts on Linux with dark theme	2016-04-07 18:57:11 +02:00
ImageReader.py	Fixed up the ImageReader after the breaking changes else where.	2016-05-19 15:10:31 +02:00
ImageReaderUI.py	Codestyle fixes	2016-02-15 14:18:01 +01:00