chiark / gitweb /
Merge conflic solved
authorDaid <daid303@gmail.com>
Tue, 17 Apr 2012 17:14:48 +0000 (19:14 +0200)
committerDaid <daid303@gmail.com>
Tue, 17 Apr 2012 17:14:48 +0000 (19:14 +0200)
commit6885a39be16ceabff508f8497845e1f1b07f09c3
tree8d22d6280b88363eb4f4c7f438dbe667f1d63a89
parent0ed8e32b0c5bca5d3ce81c789c9418b77f9c5aac
parentf52575373a78c08291d926dc7b67e5217531567d
Merge conflic solved
Merge branch 'master' of github.com:daid/Cura

Conflicts:
Cura/util/profile.py
Cura/cura_sf/fabmetheus_utilities/settings.py
Cura/gui/opengl.py
Cura/util/profile.py