chiark / gitweb /
~ianmdlvl / cura.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1205ac9 faf8d96)
Merge branch 'master' into SteamEngine
authordaid303 <daid303@gmail.com>
Fri, 22 Mar 2013 12:06:47 +0000 (13:06 +0100)
committerdaid303 <daid303@gmail.com>
Fri, 22 Mar 2013 12:06:47 +0000 (13:06 +0100)
1  2 
Cura/gui/mainWindow.py patch | diff1 | diff2 | blob | history

diff --cc Cura/gui/mainWindow.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.