Merge branch 'dev_2' into dev

Browse Source

Conflicts:
README.md
gcode.c
motion_control.c
planner.c
planner.h
protocol.c
report.c
settings.c
settings.h
stepper.c
stepper.h

...

This commit is contained in:

Sonny Jeon

2013-10-29 19:10:39 -06:00

parent b06643a2e0

commit 4f9bcde40e

33 changed files with 3524 additions and 1029 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

876

planner.c

File diff suppressed because it is too large Load Diff