chiark / gitweb /
Merge branch 'master' into SteamEngine
authordaid303 <daid303@gmail.com>
Fri, 12 Apr 2013 17:15:35 +0000 (19:15 +0200)
committerdaid303 <daid303@gmail.com>
Fri, 12 Apr 2013 17:15:35 +0000 (19:15 +0200)
commitd45198f783d30fa8ed1137dd36b9fae34f4c8ea1
tree90421be58238355431a0e43fd0e229d0d656df79
parent295014d747be9fc993d5251be6489972b3953a41
parent0669bc600fe51185206bf11ac244477d794ca16e
Merge branch 'master' into SteamEngine

Conflicts:
Cura/slice/__main__.py
Cura/slice/cura_sf/fabmetheus_utilities/settings.py
Cura/gui/preview3d.py
Cura/gui/simpleMode.py
Cura/gui/util/openglGui.py