chiark / gitweb /
Merge tag '15.01-RC7' into upstream
authorYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Fri, 6 Mar 2015 17:31:47 +0000 (12:31 -0500)
committerYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Fri, 6 Mar 2015 17:31:47 +0000 (12:31 -0500)
commitc8fe3761b1e28770e0895733c409c581830e1112
tree09558b06503e5a9ed2c298f4427b439f0a2f15bb
parent81831e568dc116305da0ebc06b6f81e7e5abd070
parent27fe37595c12315e930fe52f683b19d35ec31844
Merge tag '15.01-RC7' into upstream

Conflicts:
Cura/gui/firmwareInstall.py
Cura/gui/mainWindow.py
Cura/gui/sceneView.py
Cura/util/profile.py
Cura/gui/configWizard.py
Cura/gui/firmwareInstall.py
Cura/gui/mainWindow.py
Cura/gui/sceneView.py
Cura/util/profile.py
package.sh