chiark / gitweb /
~ianmdlvl / marlin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7ce99d fbd282b)
Merge pull request #170 from linagee/Marlin_v1
authorBernhard Kubicek <kubicek@gmx.at>
Sat, 2 Jun 2012 10:46:56 +0000 (03:46 -0700)
committerBernhard Kubicek <kubicek@gmx.at>
Sat, 2 Jun 2012 10:46:56 +0000 (03:46 -0700)
Marlin v1

1  2 
Marlin/Configuration.h patch | diff1 | diff2 | blob | history
Marlin/thermistortables.h patch | diff1 | diff2 | blob | history

diff --cc Marlin/Configuration.h
Simple merge
diff --cc Marlin/thermistortables.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.