Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

Browse Source

This should fix issues with pull request 467, I hope.

Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin.pde
	Marlin/ultralcd_implementation_hitachi_HD44780.h

...

This commit is contained in:

kiyoshigawa

2013-06-08 08:48:18 -06:00

parent 4b19c8552e 3dea417c25

commit 6a81291c57

22 changed files with 3394 additions and 1150 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

864

Marlin/pins.h

File diff suppressed because it is too large Load Diff