chiark / gitweb /
Merge branch 'production-phase1'
authorYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Tue, 20 Jan 2015 22:41:20 +0000 (17:41 -0500)
committerYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Tue, 20 Jan 2015 22:41:20 +0000 (17:41 -0500)
commit1e15e33b586c3170d3eea4f2422bf94ae4ddf585
treebfb53320479f37a6897bab6d92aba541e6697546
parent2f894755ed89ae77e4d3b88c66feb4936436ba7d
parent39718d868f5117454ca6894e6877ee4aad132c2f
Merge branch 'production-phase1'

Conflicts:
Cura/gui/mainWindow.py
Cura/gui/sceneView.py
Cura/util/sliceEngine.py
Cura/gui/configWizard.py
Cura/gui/mainWindow.py
Cura/gui/sceneView.py
Cura/util/pluginInfo.py
Cura/util/sliceEngine.py