Ghostkeeper f0d4ea43c2 Merge branch 'master' of github.com:Ultimaker/Cura		2017-04-19 10:39:05 +02:00
..
definitions	Merge branch 'revise_jellybox_support' of github.com:IMADE3D/Cura into IMADE3D-revise_jellybox_support	2017-04-19 10:36:20 +02:00
extruders	Update cartesio_extruder_3.def.json	2017-04-07 13:03:32 +02:00
i18n	Merge branch '2.5'	2017-04-13 15:02:29 +02:00
images	T466: Revert the previous commit since it messed up the file rights.	2016-12-23 15:53:15 -05:00
meshes	Resized Rigid3D Zero2 Platform STL	2017-04-18 22:49:50 +03:00
qml	Removed unused code, added ';' to end of lines. CURA-3574	2017-04-19 10:28:16 +02:00
quality	Merge branch '2.5'	2017-04-14 17:06:37 +02:00
shaders	WIP OpenGL 4.1 core profile. CURA-3273	2017-01-31 17:05:00 +01:00
themes/cura	Put sizes and numbers for toggle button into theme	2017-04-19 08:56:11 +02:00
variants	Merge branch '2.5'	2017-04-14 15:04:05 +02:00