Manual Merge branch 'fix_setting_issues_2.1_merge' of https://github.com/Ultimaker/Cura

Browse source

This is a manual merge. I did a checkout on specific files from another branch

That branch branched from 2.1 and I cherry-picked all commits which were on master but not on 2.1 manually by reviewing each of them

This way of merging bypasses all problems we had with the standard merges from 2.1 into master

CURA-1349

...

This commit is contained in:

Tim Kuipers 2016-04-11 18:44:56 +02:00

parent d5bf9b3733

commit a144a51da4

5 changed files with 35 additions and 86 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files