chiark / gitweb /
~ianmdlvl / cura.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12e25b5 b6492df)
Merge remote-tracking branch 'upstream/master'
authorFerdi van der Werf <efcm@vdwerf.eu>
Tue, 24 Apr 2012 16:08:59 +0000 (18:08 +0200)
committerFerdi van der Werf <efcm@vdwerf.eu>
Tue, 24 Apr 2012 16:08:59 +0000 (18:08 +0200)

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