chiark / gitweb /
Merge tag '15.01-RC9' into upstream
authorYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Fri, 6 Mar 2015 18:05:22 +0000 (13:05 -0500)
committerYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Fri, 6 Mar 2015 18:05:22 +0000 (13:05 -0500)
commit3d0378d6c04a6f6c698d448dad2f26ba1c67ad51
treeff871d9bd0156b69c6dce6abae9cae10722379bb
parent11df3f11afd58b8d612879c9da64e16d204adb84
parentb945138b318467c60efdf9ebd489ec6be56040e4
Merge tag '15.01-RC9' into upstream

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