chiark / gitweb /
Merge tag '15.02.1' into upstream
authorYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Fri, 6 Mar 2015 18:18:37 +0000 (13:18 -0500)
committerYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Fri, 6 Mar 2015 18:18:37 +0000 (13:18 -0500)
commit2a612b615f3c094a7bbd6c677babdcab45384cbe
tree10f649d5287ad42f180349fc2571aeeb7a545b17
parent7957b3fe732d2fd1fbb18adc2d4c6379e8939acc
parent67d28e600c8e9cdc352e5c7b04b532faf2e48f44
Merge tag '15.02.1' into upstream

Conflicts:
Cura/gui/sceneView.py
README.md
Cura/gui/configWizard.py
Cura/gui/mainWindow.py
Cura/gui/sceneView.py
Cura/util/profile.py
Cura/util/resources.py
README.md
package.sh