ChrisTerBeke acb709e804 Fix merge conflicts with #2422

2017-09-14 13:27:32 +02:00

..

definitions

Merge branch 'fractal_3d_infill_alternate'

2017-09-14 12:34:31 +02:00

extruders

Cartesio additional extruder position updates

2017-07-12 15:30:12 +02:00

i18n

Remove auto-generated file

2017-09-10 14:00:49 +02:00

images

Redesign splash window

2017-09-14 11:36:27 +02:00

meshes

Merge pull request #2162 from FABtotum/master

2017-08-31 12:56:24 +02:00

qml

Fix text overlapping problem for adhesion in recommended mode

2017-09-14 12:08:27 +02:00

quality

Merged branch - CURA-4270

2017-09-13 13:25:00 +02:00

shaders

Remove z-fighting kludge

2017-09-12 15:06:06 +02:00

themes

Fix merge conflicts with #2422

2017-09-14 13:27:32 +02:00

variants

Merged branch - CURA-4270

2017-09-13 13:25:00 +02:00