chiark / gitweb /
~ianmdlvl / cura.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a8481ef 1505743)
Merge branch 'master' into SteamEngine
authordaid303 <daid303@gmail.com>
Thu, 4 Apr 2013 12:47:35 +0000 (14:47 +0200)
committerdaid303 <daid303@gmail.com>
Thu, 4 Apr 2013 12:47:35 +0000 (14:47 +0200)
commit40c136ab77c2f0597b003a6ae38c1554c2c6c28d
tree52f5b5df19155a59d91813e79fcd04083f2fc4fetree | snapshot
parenta8481efb6050d25654e7c8fb6b9e797b2629346bcommit | diff
parent1505743fe179920957b5596424a86907fb7e8854commit | diff
Merge branch 'master' into SteamEngine

Conflicts:
Cura/slice/cura_sf/fabmetheus_utilities/svg_writer.py
Cura/slice/__main__.py blob1 | blob2 | history
Unnamed repository; edit this file 'description' to name the repository.