Ghostkeeper 58bf3e7ab3 Merge branch 'master' of github.com:Rigid3D/Cura into Rigid3D-master		2017-04-19 09:27:54 +02:00
..
definitions	Merge branch 'master' of github.com:Rigid3D/Cura into Rigid3D-master	2017-04-19 09:27:54 +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	Change Label to Text to fix ugly fonts	2017-04-18 13:35:39 +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	Merge pull request #1495 from fieldOfView/feature_draggable_range_slider2	2017-03-07 11:43:17 +01:00
variants	Merge branch '2.5'	2017-04-14 15:04:05 +02:00