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:12:09 -06:00

parent 4f9bcde40e 0ac6c87196

commit 4402a9f74a

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

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available