Firmware2/Marlin/configurator/config
AnHardt b4b19a6cbd Merge https://github.com/MarlinFirmware/Marlin into Bulgarian
Conflicts:
	Marlin/Configuration.h
	Marlin/configurator/config/Configuration.h
	Marlin/example_configurations/Felix/Configuration.h
	Marlin/example_configurations/Felix/Configuration_DUAL.h
	Marlin/example_configurations/Hephestos/Configuration.h
	Marlin/example_configurations/K8200/Configuration.h
	Marlin/example_configurations/SCARA/Configuration.h
	Marlin/example_configurations/WITBOX/Configuration.h
	Marlin/example_configurations/delta/generic/Configuration.h
	Marlin/example_configurations/delta/kossel_mini/Configuration.h
	Marlin/example_configurations/makibox/Configuration.h
	Marlin/example_configurations/tvrrug/Round2/Configuration.h

Conflicts with my Chinese implementation resolved.
2015-04-28 09:24:32 +02:00
..
_htaccess More robust fetch code, download buttons 2015-02-11 04:59:07 -08:00
boards.h Bring configurator up-to-date 2015-04-05 22:38:15 -05:00
Configuration_adv.h Merge branch 'Development' into eeprom_in_gcode 2015-04-27 21:47:47 -07:00
Configuration.h Merge https://github.com/MarlinFirmware/Marlin into Bulgarian 2015-04-28 09:24:32 +02:00
language.h Change M421 to take coordinates 2015-04-27 19:48:34 -07:00