Jaime van Kessel c087f4b0dc Merge branch 'master' of git://github.com/maukcc/cura		2017-04-14 14:30:25 +02:00
..
definitions	Merge branch 'master' of git://github.com/maukcc/cura	2017-04-14 14:30:25 +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	Add new type of platform	2017-04-12 11:12:45 -05:00
qml	Change all Label to Text so fonts are rendered correct	2017-04-14 13:16:48 +02:00
quality	Merge branch 'master' of git://github.com/maukcc/cura	2017-04-14 14:30:25 +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 'master' of git://github.com/maukcc/cura	2017-04-14 14:30:25 +02:00