chiark / gitweb /
~ianmdlvl / marlin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 43f5c3e 4fd75dc)
Merge branch 'Marlin_v1' of https://github.com/dob71/Marlin into Marlin_v1
authorErik van der Zalm <erik@vdzalm.eu>
Wed, 7 Dec 2011 18:57:39 +0000 (19:57 +0100)
committerErik van der Zalm <erik@vdzalm.eu>
Wed, 7 Dec 2011 18:57:39 +0000 (19:57 +0100)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.