chiark / gitweb /
~ianmdlvl / marlin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc0064e d3bfffc)
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
authorBernhard Kubicek <kubicek@gmx.at>
Sun, 6 Nov 2011 21:48:36 +0000 (22:48 +0100)
committerBernhard Kubicek <kubicek@gmx.at>
Sun, 6 Nov 2011 21:48:36 +0000 (22:48 +0100)

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