chiark / gitweb /
Merge branch 'master' of github.com:daid/Cura
authordaid303 <daid303@gmail.com>
Mon, 17 Dec 2012 13:15:50 +0000 (14:15 +0100)
committerdaid303 <daid303@gmail.com>
Mon, 17 Dec 2012 13:15:50 +0000 (14:15 +0100)
1  2 
Cura/gui/app.py

diff --cc Cura/gui/app.py
Simple merge