chiark / gitweb /
Merge tag '15.01-RC1' into upstream
authorYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Tue, 3 Mar 2015 18:15:48 +0000 (13:15 -0500)
committerYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Tue, 3 Mar 2015 18:15:48 +0000 (13:15 -0500)
commit368e3d98cc195ee48b80672fe6074fe7f5d55a40
tree83ced09bba4c081a7e3a6fff0c69ab76b2b3e578
parentac03f8c6d6f11028a6b701580db73ec0aaab2000
parent3f610ddc9cfca4da790abc415cf5054050ae4c82
Merge tag '15.01-RC1' into upstream

Conflicts:
Cura/util/sliceEngine.py
Cura/util/sliceEngine.py
package.sh