chiark / gitweb /
~ianmdlvl / cura.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 39e76ca 08152fa)
Merge remote-tracking branch 'origin/new-settings' into new-settings
authorYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Fri, 31 Jul 2015 20:28:13 +0000 (16:28 -0400)
committerYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Fri, 31 Jul 2015 20:28:13 +0000 (16:28 -0400)

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