Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1

Browse source

...

This commit is contained in:

Jaime van Kessel 2016-03-31 10:39:28 +02:00

parent 82eda02d37 52d064d7ab

commit effcbe5842

24 changed files with 299 additions and 322 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

583

resources/machines/fdmprinter.json

View file

File diff suppressed because it is too large Load diff