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
..
config	Merge https://github.com/MarlinFirmware/Marlin into Bulgarian	2015-04-28 09:24:32 +02:00
css	Optimize initial loading, code cleanup	2015-03-02 05:23:36 -08:00
js	Thermistor values for configurator	2015-04-08 03:12:21 -07:00
index.html	Apply CUSTOM_MACHINE_NAME to configurations	2015-04-10 21:29:42 -07:00