chiark / gitweb /
~ianmdlvl / marlin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b21d519 85c8a87)
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
authorBernhard Kubicek <kubicek@gmx.at>
Sun, 20 Nov 2011 13:45:38 +0000 (14:45 +0100)
committerBernhard Kubicek <kubicek@gmx.at>
Sun, 20 Nov 2011 13:45:38 +0000 (14:45 +0100)
1  2 
README.md patch | diff1 | diff2 | blob | history

diff --cc README.md
Simple merge
Unnamed repository; edit this file 'description' to name the repository.