Lipu Fei b68b154e59 Use contentLoader.item to determine height ... CURA-6435		2019-04-05 09:10:53 +02:00
..
bundled_packages	Fix merge conflicts with master	2019-03-21 14:59:53 +01:00
definitions	Fix combing setting	2019-04-04 16:22:03 +02:00
extruders	Merge pull request #5497 from TinkerGnome/Mark2_definition	2019-04-04 08:08:46 +02:00
i18n	Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action	2019-03-21 15:00:15 +01:00
images	Merge pull request #5497 from TinkerGnome/Mark2_definition	2019-04-04 08:08:46 +02:00
meshes	Adding platform to HMS434	2019-03-29 14:26:42 +01:00
qml	Use contentLoader.item to determine height	2019-04-05 09:10:53 +02:00
quality	Add HMS434	2019-03-27 10:23:59 +01:00
setting_visibility	Put all of wiping settings to expert.cfg file to allow also browsing them	2019-04-03 13:46:37 +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	Merge branch 'master' into WIP_onboarding	2019-04-03 11:53:40 +02:00
variants	Merge pull request #5497 from TinkerGnome/Mark2_definition	2019-04-04 08:08:46 +02:00