chiark / gitweb /
~ianmdlvl / cura.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 84d2b07 2962c49)
Merge remote-tracking branch 'upstream/master'
authorFerdi van der Werf <efcm@vdwerf.eu>
Sun, 22 Apr 2012 16:31:51 +0000 (18:31 +0200)
committerFerdi van der Werf <efcm@vdwerf.eu>
Sun, 22 Apr 2012 16:31:51 +0000 (18:31 +0200)

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