chiark / gitweb /
Merge branch 'master' of github.com:daid/Cura
authorDaid <daid303@gmail.com>
Mon, 4 Jun 2012 13:06:54 +0000 (15:06 +0200)
committerDaid <daid303@gmail.com>
Mon, 4 Jun 2012 13:06:54 +0000 (15:06 +0200)
1  2 
Cura/cura_sf/fabmetheus_utilities/settings.py
Cura/util/profile.py

Simple merge