chiark / gitweb /
Merge tag '15.01' into upstream
authorYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Fri, 6 Mar 2015 18:06:37 +0000 (13:06 -0500)
committerYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Fri, 6 Mar 2015 18:06:37 +0000 (13:06 -0500)
commit7957b3fe732d2fd1fbb18adc2d4c6379e8939acc
tree502564b669eec32ca97077cefeb6f1bf5f93eeba
parentace7bd64823b7a2b702c9a74ce20523e7f245467
parente91c61f4689f6d1337f45ae8310c4d983db6de6f
Merge tag '15.01' into upstream

Conflicts:
Cura/util/profile.py
Cura/gui/mainWindow.py
Cura/gui/preferencesDialog.py
Cura/util/profile.py
package.sh