Ghostkeeper 7094b222b1 Remove duplicate translation entry ... Probably due to a merge conflict being resolved in a less than perfect way. Sorry. Contributes to issue CURA-6521.		2019-05-15 10:58:48 +02:00
..
bundled_packages	Fix merge issue	2019-04-26 11:53:50 +02:00
definitions	Merge remote-tracking branch 'origin/4.1'	2019-05-14 10:41:12 +02:00
extruders	Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master	2019-05-13 15:11:32 +02:00
i18n	Remove duplicate translation entry	2019-05-15 10:58:48 +02:00
images	add START and STE320 profiles	2019-04-25 15:42:59 +04:00
meshes	Add files via upload	2019-05-02 12:12:31 -04:00
qml	Merge branch '4.1'	2019-05-14 14:50:36 +02:00
quality	Set default infill density for tree support to 0% in profiles	2019-04-29 12:06:54 +02:00
setting_visibility	Merge branch 'master' into feature_z_hop_extruder_switch	2019-04-22 10:45:57 +03:00
shaders	Fix support blocker on older (legacy) opengl	2018-05-14 14:29:41 +02:00
texts	Load change log from file for on-boarding page	2019-03-26 15:49:40 +01:00
themes	Increase width of toolbox header tab	2019-05-06 13:42:42 +02:00
variants	Merge pull request #5497 from TinkerGnome/Mark2_definition	2019-04-04 08:08:46 +02:00