chiark / gitweb /
Merge branch 'master' into SteamEngine
authordaid303 <daid303@gmail.com>
Fri, 29 Mar 2013 17:41:09 +0000 (18:41 +0100)
committerdaid303 <daid303@gmail.com>
Fri, 29 Mar 2013 17:41:09 +0000 (18:41 +0100)
commit6300f6eab82707367c5a90a9c4337eae5dc83486
treecb9fbaea2b7fd2329d136acfbba05ce360600f55
parent40227a815475b342cf02d32e1ee44c1d71878721
parent97716443eddaa816daef29b760a8907d90a090fd
Merge branch 'master' into SteamEngine

Conflicts:
Cura/gui/mainWindow.py