You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Erik van der Zalm
04d3b5537f
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Conflicts:
Marlin/Configuration.h
Marlin/EEPROMwrite.h
Marlin/Marlin.h
Marlin/Marlin.pde
Marlin/temperature.cpp
Marlin/temperature.h
Marlin/thermistortables.h
|
13 years ago |
.. |
COPYING
|
first commit
|
13 years ago |
Configuration.h
|
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
|
13 years ago |
EEPROMwrite.h
|
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
|
13 years ago |
FatStructs.h
|
changed end of line to windows, which seems to be the majority of developers main platform.
|
13 years ago |
Makefile
|
merge from the branch bkubicek/Marlin/zalmmerge
|
13 years ago |
Marlin.h
|
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
|
13 years ago |
Marlin.pde
|
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
|
13 years ago |
Sd2Card.cpp
|
changed end of line to windows, which seems to be the majority of developers main platform.
|
13 years ago |
Sd2Card.h
|
changed end of line to windows, which seems to be the majority of developers main platform.
|
13 years ago |
Sd2PinMap.h
|
changed end of line to windows, which seems to be the majority of developers main platform.
|
13 years ago |
SdFat.h
|
changed end of line to windows, which seems to be the majority of developers main platform.
|
13 years ago |
SdFatUtil.h
|
changed end of line to windows, which seems to be the majority of developers main platform.
|
13 years ago |
SdFatmainpage.h
|
changed end of line to windows, which seems to be the majority of developers main platform.
|
13 years ago |
SdFile.cpp
|
changed end of line to windows, which seems to be the majority of developers main platform.
|
13 years ago |
SdInfo.h
|
changed end of line to windows, which seems to be the majority of developers main platform.
|
13 years ago |
SdVolume.cpp
|
changed end of line to windows, which seems to be the majority of developers main platform.
|
13 years ago |
createTemperatureLookup.py
|
first commit
|
13 years ago |
fastio.h
|
changed end of line to windows, which seems to be the majority of developers main platform.
|
13 years ago |
pins.h
|
changed end of line to windows, which seems to be the majority of developers main platform.
|
13 years ago |
planner.cpp
|
Revert "this is not working. Do you maybe know why?"
|
13 years ago |
planner.h
|
merge from the branch bkubicek/Marlin/zalmmerge
|
13 years ago |
speed_lookuptable.h
|
changed end of line to windows, which seems to be the majority of developers main platform.
|
13 years ago |
stepper.cpp
|
Revert "this is not working. Do you maybe know why?"
|
13 years ago |
stepper.h
|
merge from the branch bkubicek/Marlin/zalmmerge
|
13 years ago |
streaming.h
|
changed end of line to windows, which seems to be the majority of developers main platform.
|
13 years ago |
temperature.cpp
|
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
|
13 years ago |
temperature.h
|
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
|
13 years ago |
thermistortables.h
|
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
|
13 years ago |
ultralcd.h
|
changed end of line to windows, which seems to be the majority of developers main platform.
|
13 years ago |
ultralcd.pde
|
Revert "this is not working. Do you maybe know why?"
|
13 years ago |