Merge branch 'Development-Marlin' into Development

Browse Source

Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp

...

This commit is contained in:

Edward Patel

2015-04-05 04:06:02 +02:00

parent 48b1c3822f cb02bc6db4

commit ea10601406

50 changed files with 1603 additions and 1183 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

1479

Marlin/Marlin_main.cpp

File diff suppressed because it is too large Load Diff