chiark / gitweb /
~ianmdlvl / cura.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7075262 d4183ff)
Merge branch 'new-settings' into devel
authorYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Fri, 31 Jul 2015 20:28:45 +0000 (16:28 -0400)
committerYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Fri, 31 Jul 2015 20:28:45 +0000 (16:28 -0400)
This merges a few missed commits


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