bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
04d3b5537f
Marlin_Firmware/Marlin
History
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
2011-11-05 20:03:38 +01:00
..
Configuration.h Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-11-05 20:03:38 +01:00
COPYING first commit 2011-08-12 22:28:35 +02:00
createTemperatureLookup.py first commit 2011-08-12 22:28:35 +02:00
EEPROMwrite.h Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-11-05 20:03:38 +01:00
fastio.h changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
FatStructs.h changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
Makefile merge from the branch bkubicek/Marlin/zalmmerge 2011-11-05 14:13:20 +01:00
Marlin.h Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-11-05 20:03:38 +01:00
Marlin.pde Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-11-05 20:03:38 +01:00
pins.h changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
planner.cpp Revert "this is not working. Do you maybe know why?" 2011-11-05 16:49:29 +01:00
planner.h merge from the branch bkubicek/Marlin/zalmmerge 2011-11-05 14:13:20 +01:00
Sd2Card.cpp changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
Sd2Card.h changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
Sd2PinMap.h changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
SdFat.h changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
SdFatmainpage.h changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
SdFatUtil.h changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
SdFile.cpp changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
SdInfo.h changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
SdVolume.cpp changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
speed_lookuptable.h changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
stepper.cpp Revert "this is not working. Do you maybe know why?" 2011-11-05 16:49:29 +01:00
stepper.h merge from the branch bkubicek/Marlin/zalmmerge 2011-11-05 14:13:20 +01:00
streaming.h changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
temperature.cpp Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-11-05 20:03:38 +01:00
temperature.h Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-11-05 20:03:38 +01:00
thermistortables.h Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-11-05 20:03:38 +01:00
ultralcd.h changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
ultralcd.pde Revert "this is not working. Do you maybe know why?" 2011-11-05 16:49:29 +01:00