Jaime van Kessel 66e50ceb37 Merge branch '15.06' of https://github.com/Ultimaker/Cura into 15.06 ...

Conflicts:
	plugins/LayerView/LayerView.py

2015-06-05 17:43:34 +02:00

..

__init__.py

Implemented feature described by #30

2015-06-05 17:40:57 +02:00

LayerView.py

Merge branch '15.06' of https://github.com/Ultimaker/Cura into 15.06

2015-06-05 17:43:34 +02:00

LayerView.qml

Implemented feature described by #30

2015-06-05 17:40:57 +02:00

LayerViewProxy.py

Implemented feature described by #30

2015-06-05 17:40:57 +02:00