Jaime van Kessel 16a3f10e1e Merge branch 'master' of github.com:Ultimaker/Cura

2017-04-14 11:27:00 +02:00

..

definitions

Merge branch '2.5'

2017-04-14 10:29:43 +02:00

extruders

Update cartesio_extruder_0.def.json

2017-04-06 14:29:36 +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

Merge branch 'feature_filter_materials_by_diameter' of git://github.com/fieldOfView/Cura

2017-04-14 11:22:35 +02:00

quality

Merge branch '2.5'

2017-04-14 10:29:43 +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-13 18:21:35 +02:00