chiark / gitweb /
~ianmdlvl / cura.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 40227a8 9771644)
Merge branch 'master' into SteamEngine
authordaid303 <daid303@gmail.com>
Fri, 29 Mar 2013 17:41:09 +0000 (18:41 +0100)
committerdaid303 <daid303@gmail.com>
Fri, 29 Mar 2013 17:41:09 +0000 (18:41 +0100)
Conflicts:
Cura/gui/mainWindow.py


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