chiark / gitweb /
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)
commit800501b50f88d012ec9786d75dff98dfb43f4a7b
treea6aa0a01a984bca4e25c9a17b6d7b8d7e39162f0
parenta3e2bf730d01bcfc9b40c29a5e9b53d2d0ca125d
parent757bfaf3de7400d33a3d13072ac1bfa016747050
Merge branch 'for-upstream-ff' into iwj

Conflicts:
Marlin/EEPROMwrite.h
Marlin/Marlin.h
Marlin/Marlin.pde
Marlin/motion_control.cpp
Marlin/Makefile