chiark / gitweb /
~ianmdlvl / cura.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a3e2b6 318b898)
Merge branch 'master' into SteamEngine
authordaid303 <daid303@gmail.com>
Wed, 3 Apr 2013 11:24:35 +0000 (13:24 +0200)
committerdaid303 <daid303@gmail.com>
Wed, 3 Apr 2013 11:24:35 +0000 (13:24 +0200)
Conflicts:
Cura/gui/projectPlanner.py


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