chiark / gitweb /
Merge tag '15.01-RC6' into upstream
authorYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Thu, 5 Mar 2015 21:45:44 +0000 (16:45 -0500)
committerYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Thu, 5 Mar 2015 21:45:44 +0000 (16:45 -0500)
commitd0741a02b703b9f5e53c527b04593699d37751fc
treeae8d0623901dc22cd05d0824d2901faa4bd73201
parent9d3afc7ff37410191357598a442b030fc9296bc3
parent1e366958826e05e140cf7624dfc42f3853cca189
Merge tag '15.01-RC6' into upstream

Conflicts:
Cura/gui/simpleMode.py
Cura/util/profile.py
Cura/util/resources.py
Cura/util/sliceEngine.py
scripts/linux/debian_control
scripts/linux/debian_i386/DEBIAN/control
Cura/gui/simpleMode.py
Cura/util/profile.py
Cura/util/resources.py
package.sh
scripts/linux/debian_control