MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
b4b19a6cbd
Firmware/Marlin/example_configurations
History
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
..
delta Merge https://github.com/MarlinFirmware/Marlin into Bulgarian 2015-04-28 09:24:32 +02:00
Felix Merge https://github.com/MarlinFirmware/Marlin into Bulgarian 2015-04-28 09:24:32 +02:00
Hephestos Merge https://github.com/MarlinFirmware/Marlin into Bulgarian 2015-04-28 09:24:32 +02:00
K8200 Merge https://github.com/MarlinFirmware/Marlin into Bulgarian 2015-04-28 09:24:32 +02:00
makibox Merge https://github.com/MarlinFirmware/Marlin into Bulgarian 2015-04-28 09:24:32 +02:00
SCARA Merge https://github.com/MarlinFirmware/Marlin into Bulgarian 2015-04-28 09:24:32 +02:00
tvrrug/Round2 Merge https://github.com/MarlinFirmware/Marlin into Bulgarian 2015-04-28 09:24:32 +02:00
WITBOX Merge https://github.com/MarlinFirmware/Marlin into Bulgarian 2015-04-28 09:24:32 +02:00