chiark / gitweb /
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
authorErik van der Zalm <erik@vdzalm.eu>
Sat, 5 Nov 2011 19:03:38 +0000 (20:03 +0100)
committerErik van der Zalm <erik@vdzalm.eu>
Sat, 5 Nov 2011 19:03:38 +0000 (20:03 +0100)
commit04d3b5537f7c23adf7ea362a8492d21114aa6a2e
tree1d9f152e3c97ba1d57c549c1f3571a42cd21a1dc
parentd15f01e1b45119838900da53128c619ebe93895d
parentea86a5e10f7b8c0b2e0e0bf97a1fc95dbac4ae89
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
Marlin/Configuration.h
Marlin/EEPROMwrite.h
Marlin/Marlin.h
Marlin/Marlin.pde
Marlin/temperature.cpp
Marlin/temperature.h
Marlin/thermistortables.h