chiark / gitweb /
~ianmdlvl / cura.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fbe2900 c7e497c)
Merge remote-tracking branch 'upstream/master'
authorIlya Kulakov <kulakov.ilya@gmail.com>
Fri, 7 Dec 2012 07:48:25 +0000 (14:48 +0700)
committerIlya Kulakov <kulakov.ilya@gmail.com>
Fri, 7 Dec 2012 07:48:25 +0000 (14:48 +0700)

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