chiark / gitweb /
Merge tag '15.01-RC3' into upstream
authorYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Tue, 3 Mar 2015 18:18:18 +0000 (13:18 -0500)
committerYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Tue, 3 Mar 2015 18:18:18 +0000 (13:18 -0500)
commitfb934f7d29efac4f60f8c550436d9590b391fcf4
treefb4c405dedb8da677092b041223eb5901321274c
parentfe5ccd83372d148b1519dd27dbb89ef11dedb1cf
parent973a80909d1e17c4770334a9d1437d1b9e61d42e
Merge tag '15.01-RC3' into upstream

Conflicts:
Cura/util/profile.py
Cura/gui/configWizard.py
Cura/util/profile.py
Cura/util/sliceEngine.py
package.sh