chiark / gitweb /
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
authorChristian Thalhammer <christian_thalhammer@gmx.at>
Mon, 13 Feb 2012 12:07:55 +0000 (13:07 +0100)
committerChristian Thalhammer <christian_thalhammer@gmx.at>
Mon, 13 Feb 2012 12:07:55 +0000 (13:07 +0100)
commitd309565b56610b4295c7f517c6fada8d51c0ef04
treee6c5a11249be3d54dbc3416824a12cc7241b08eb
parent0e3631ff4bdae41cc638c59a72af654931bfaf04
parentfa2e1be0ca890cd4112dbb951b9297bb38a42f2d
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1

Conflicts:
Marlin/Configuration.h
Marlin/Configuration.h
Marlin/Marlin.pde
Marlin/fastio.h
Marlin/pins.h
Marlin/temperature.cpp
Marlin/ultralcd.pde