Arjen Hiemstra d659e5b8b8 Merge branch '15.06' ... Conflicts: cura/CuraApplication.py		2015-07-15 00:38:29 +02:00
..
i18n	Update Cura translation file with the correct version	2015-06-30 17:29:40 +02:00
images	Final changes for release	2015-06-30 17:40:58 +02:00
meshes	Added witbox profile posted on UM forum by datmos	2015-07-08 12:27:27 +02:00
qml	Merge branch '15.06'	2015-07-15 00:38:29 +02:00
settings	feat: infill wipe dist; wireframe restructure & renaming; bugfix: draft_shield_height inherit_function	2015-07-10 13:13:52 +02:00
themes/cura	Merge branch '15.06'	2015-07-13 13:52:33 +02:00