chiark / gitweb /
~ianmdlvl / marlin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a3e2bf7 757bfaf)
Merge branch 'for-upstream-ff' into iwj
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 9 Aug 2012 19:28:46 +0000 (20:28 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 9 Aug 2012 19:28:46 +0000 (20:28 +0100)
Conflicts:
Marlin/EEPROMwrite.h
Marlin/Marlin.h
Marlin/Marlin.pde
Marlin/motion_control.cpp

1  2 
Marlin/Makefile patch | diff1 | diff2 | blob | history

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