chiark / gitweb /
Merge remote-tracking branch 'justblair/master' into Marlin_v1
authorErik van der Zalm <erik@vdzalm.eu>
Sat, 3 Mar 2012 19:20:55 +0000 (20:20 +0100)
committerErik van der Zalm <erik@vdzalm.eu>
Sat, 3 Mar 2012 19:20:55 +0000 (20:20 +0100)
commitcb0c84e0755136d64f42572470d9d6e0e658542f
tree10de981948ef51025c7b63256e82f328b31cb613
parent1d5809d458ac056f4aaddcab1df896cdcb78b815
parent4879de08e888a2bbdb52bbf42e453e67b488d2e4
Merge remote-tracking branch 'justblair/master' into Marlin_v1
Marlin/Marlin.pde
Marlin/pins.h
Marlin/planner.cpp
Marlin/ultralcd.pde