chiark - git - ianmdlvl - marlin.git/commit

chiark / gitweb /

~ianmdlvl / marlin.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 85da81e 2d9a715)

author	Bernhard <bkubicek@x201.(none)>
	Mon, 28 Nov 2011 20:36:01 +0000 (21:36 +0100)
committer	Bernhard <bkubicek@x201.(none)>
	Mon, 28 Nov 2011 20:36:01 +0000 (21:36 +0100)
commit	311627141bff077a4c5ac6e602fcf6d1c7ae22ca
tree	83b3f6d5c9a1541e789c93e34d403f6edf4d3416	tree \| snapshot
parent	85da81e67349ab815985b5651aecfb7943201b3c	commit \| diff
parent	2d9a7156555e0cdd969b44cc7c4d3c8a18875cfe	commit \| diff

Merge branch 'smallopt' into Marlin_v1

Conflicts:
Marlin/temperature.h

Marlin/EEPROMwrite.h	diff1 \|	diff2 \|	blob \| history
Marlin/Marlin.h	diff1 \|	diff2 \|	blob \| history
Marlin/Marlin.pde	diff1 \|	diff2 \|	blob \| history
Marlin/planner.cpp	diff1 \|	diff2 \|	blob \| history
Marlin/planner.h	diff1 \|	diff2 \|	blob \| history
Marlin/stepper.cpp	diff1 \|	diff2 \|	blob \| history
Marlin/temperature.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.