chiark / gitweb /
Merge branch 'master' into SteamEngine
authordaid303 <daid303@gmail.com>
Wed, 3 Apr 2013 11:24:35 +0000 (13:24 +0200)
committerdaid303 <daid303@gmail.com>
Wed, 3 Apr 2013 11:24:35 +0000 (13:24 +0200)
commit89930496726eff93035690c79776666aef17321e
tree130c981911cd501739f1c96fa7eb663dd344b552
parent1a3e2b6bcca7c1a178fc6b45ba8bf1cba576627d
parent318b898f0347ec53746e6171bf890d20afce0404
Merge branch 'master' into SteamEngine

Conflicts:
Cura/gui/projectPlanner.py