chiark / gitweb /
~ianmdlvl / cura.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d79297 0834aec)
Merge branch 'master' of github.com:daid/Cura
authorDaid <daid303@gmail.com>
Wed, 28 Mar 2012 18:36:52 +0000 (20:36 +0200)
committerDaid <daid303@gmail.com>
Wed, 28 Mar 2012 18:36:52 +0000 (20:36 +0200)
1  2 
Cura/gui/mainWindow.py patch | diff1 | diff2 | blob | history
Cura/gui/printWindow.py patch | diff1 | diff2 | blob | history

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