jack 0ad344f91d Merge pull request #1640 from Ultimaker/bugfix_CURA-3421_per_model_combobox ...

CURA-3421 Set SettingsComboBox value if we get undefined from resolve

2017-04-04 10:57:42 +02:00

..

definitions

Merge branch '2.5'

2017-04-03 11:38:28 +02:00

extruders

Merge branch '2.5'

2017-03-28 12:55:18 +02:00

i18n

Add Japanese and Korean partial translations

2017-04-04 09:05:12 +02:00

images

T466: Revert the previous commit since it messed up the file rights.

2016-12-23 15:53:15 -05:00

meshes

Velleman Vertex K8400 single and dual head

2017-02-24 20:57:46 +01:00

qml

Merge pull request #1640 from Ultimaker/bugfix_CURA-3421_per_model_combobox

2017-04-04 10:57:42 +02:00

quality

Merge branch '2.5'

2017-04-03 11:38:28 +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 'maukcc-master'

2017-03-29 13:26:14 +02:00