chiark / gitweb /
~ianmdlvl / marlin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a6afee 6e6fdb9)
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
authorBernhard Kubicek <kubicek@gmx.at>
Sat, 19 Nov 2011 16:09:43 +0000 (17:09 +0100)
committerBernhard Kubicek <kubicek@gmx.at>
Sat, 19 Nov 2011 16:09:43 +0000 (17:09 +0100)

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