chiark / gitweb /
~ianmdlvl / cura.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 14b4a4a 1f80cd3)
Merge branch 'master' of github.com:daid/Cura
authordaid <daid303@gmail.com>
Mon, 2 Jul 2012 08:11:52 +0000 (10:11 +0200)
committerdaid <daid303@gmail.com>
Mon, 2 Jul 2012 08:11:52 +0000 (10:11 +0200)
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.