chiark / gitweb /
merge from the branch bkubicek/Marlin/zalmmerge
authorBernhard Kubicek <kubicek@gmx.at>
Sat, 5 Nov 2011 13:13:20 +0000 (14:13 +0100)
committerBernhard Kubicek <kubicek@gmx.at>
Sat, 5 Nov 2011 13:13:20 +0000 (14:13 +0100)
commit00674af3a82e6b6b517a12ae3e77803df4f4892d
treed5b5e0d5b2f09c08ecbf9032fb033b9a9217d71e
parentd7c4f0780b41507ae6a40cc46efb59c526e58437
merge from the branch bkubicek/Marlin/zalmmerge
20 files changed:
Marlin/Configuration.h
Marlin/EEPROMwrite.h [moved from Marlin/EEPROM.h with 94% similarity]
Marlin/Makefile
Marlin/Marlin.h
Marlin/Marlin.pde
Marlin/fastio.h
Marlin/lcd.h [deleted file]
Marlin/lcd.pde [deleted file]
Marlin/planner.cpp
Marlin/planner.h
Marlin/stepper.cpp
Marlin/stepper.h
Marlin/temperature.cpp
Marlin/temperature.h
Marlin/thermistortables.h
Marlin/ultralcd.h
Marlin/ultralcd.pde
README
README.md [new file with mode: 0644]
merging still needs.txt [new file with mode: 0644]