Jaime van Kessel 54aeca603e Merge branch 'master' of https://github.com/Ultimaker/Cura		2015-07-27 14:25:42 +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 custom build platform for grr neo	2015-07-21 22:26:43 +02:00
qml	Added merging for multi material	2015-07-27 14:25:27 +02:00
settings	merge	2015-07-27 12:27:51 +02:00
themes/cura	Merge branch '15.06'	2015-07-13 13:52:33 +02:00