chiark / gitweb /
Merge tag '15.01-RC4' into upstream
authorYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Tue, 3 Mar 2015 20:04:55 +0000 (15:04 -0500)
committerYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Tue, 3 Mar 2015 20:04:55 +0000 (15:04 -0500)
commit54057a68a6093d90ce6a43c1681e049691c1206a
tree935923cb5d0eb6c4d263f92764bdd995bd595902
parentfb934f7d29efac4f60f8c550436d9590b391fcf4
parent76706d0295b292ad922cc70a9f61dee10523e4bd
Merge tag '15.01-RC4' into upstream

Conflicts:
Cura/gui/simpleMode.py
Cura/util/sliceEngine.py
Cura/gui/mainWindow.py
Cura/gui/sceneView.py
Cura/gui/simpleMode.py
Cura/util/profile.py
Cura/util/resources.py
Cura/util/sliceEngine.py
package.sh