AnHardt e72cb3e45d Merge https://github.com/MarlinFirmware/Marlin into tm2-utf-minus-kanji ... Conflicts: Marlin/dogm_lcd_implementation.h Marlin/ultralcd_implementation_hitachi_HD44780.h Fix merge conflicts 2		2015-03-20 13:35:47 +01:00
..
delta	Merge https://github.com/MarlinFirmware/Marlin into tm2-utf-minus-kanji	2015-03-20 13:35:47 +01:00
Felix	Added changes to the 'new' Configuration.h s	2015-03-20 10:36:29 +01:00
Hephestos	Merge https://github.com/kieranc/Marlin into PIDdebug	2015-03-20 00:07:36 +01:00
K8200	Merge https://github.com/kieranc/Marlin into PIDdebug	2015-03-20 00:07:36 +01:00
makibox	Merge https://github.com/kieranc/Marlin into PIDdebug	2015-03-20 00:07:36 +01:00
SCARA	Merge https://github.com/kieranc/Marlin into PIDdebug	2015-03-20 00:07:36 +01:00
tvrrug/Round2	Merge https://github.com/kieranc/Marlin into PIDdebug	2015-03-20 00:07:36 +01:00
WITBOX	Merge https://github.com/kieranc/Marlin into PIDdebug	2015-03-20 00:07:36 +01:00