chiark / gitweb /
~ianmdlvl / marlin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4e5becf eeb4f02)
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
authorErik van der Zalm <erik@vdzalm.eu>
Sun, 20 Nov 2011 13:51:40 +0000 (14:51 +0100)
committerErik van der Zalm <erik@vdzalm.eu>
Sun, 20 Nov 2011 13:51:40 +0000 (14:51 +0100)

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