AnHardt 9d589cbb2a Merge https://github.com/MarlinFirmware/Marlin into tm3-utf-minus-kanji ... Conflicts: Marlin/example_configurations/delta/generic/Configuration.h Marlin/example_configurations/delta/kossel_mini/Configuration.h Marlin/language.h Conflicts solved		2015-03-24 16:59:15 +01:00
..
delta	Merge https://github.com/MarlinFirmware/Marlin into tm3-utf-minus-kanji	2015-03-24 16:59:15 +01:00
Felix	Merge branch 'Development' into planner_oh_planner	2015-03-23 22:08:50 -07:00
Hephestos	Merge branch 'Development' into planner_oh_planner	2015-03-23 22:08:50 -07:00
K8200	Merge branch 'Development' into planner_oh_planner	2015-03-23 22:08:50 -07:00
makibox	Merge branch 'Development' into planner_oh_planner	2015-03-23 22:08:50 -07:00
SCARA	Merge branch 'Development' into planner_oh_planner	2015-03-23 22:08:50 -07:00
tvrrug/Round2	Merge branch 'Development' into planner_oh_planner	2015-03-23 22:08:50 -07:00
WITBOX	Merge branch 'Development' into planner_oh_planner	2015-03-23 22:08:50 -07:00