microlab
/
scube
1
1
Fork 0
Code Issues Pull Requests Releases Activity
6,721 Commits
1 Branch
0 Tags
110 MiB
2.0.x
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '2b9115330d'
${ noResults }
Commit Graph

106 Commits (2b9115330da7af08045f2ac8d7afa25da9fed7cd)

Author SHA1 Message Date
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
Erik van der Zalm d15f01e1b4 Temperature changes 13 years ago
Bernhard Kubicek b9ea0651ec Revert "this is not working. Do you maybe know why?" 
This reverts commit 8bcdb9f5f0.
 13 years ago
Bernhard Kubicek 8bcdb9f5f0 this is not working. Do you maybe know why? 13 years ago
Bernhard Kubicek 00674af3a8 merge from the branch bkubicek/Marlin/zalmmerge 13 years ago
Erik van der Zalm 094afe7c10 Merged Marlin, Marlin non gen6 and Ultimaker changes 13 years ago