chiark / gitweb /
~ianmdlvl / marlin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a9c7da0 805d37f)
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
authorBernhard Kubicek <kubicek@gmx.at>
Tue, 15 Nov 2011 21:53:04 +0000 (22:53 +0100)
committerBernhard Kubicek <kubicek@gmx.at>
Tue, 15 Nov 2011 21:53:04 +0000 (22:53 +0100)
Conflicts:
Marlin/ultralcd.h

1  2 
Marlin/Configuration.h patch | diff1 | diff2 | blob | history

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