chiark / gitweb /
~ianmdlvl / cura.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d82dfb a8963b1)
Fix confict
authorDaid <daid303@gmail.com>
Mon, 2 Apr 2012 17:39:36 +0000 (19:39 +0200)
committerDaid <daid303@gmail.com>
Mon, 2 Apr 2012 17:39:36 +0000 (19:39 +0200)
1  2 
Cura/gui/printWindow.py patch | diff1 | diff2 | blob | history

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