chiark / gitweb /
Merge tag '15.01-RC11' into upstream
authorYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Fri, 6 Mar 2015 18:05:28 +0000 (13:05 -0500)
committerYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Fri, 6 Mar 2015 18:05:28 +0000 (13:05 -0500)
1  2 
Cura/gui/configWizard.py
Cura/gui/firmwareInstall.py
Cura/gui/sceneView.py
Cura/util/bigDataStorage.py
Cura/util/machineCom.py
Cura/util/profile.py
package.sh

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc package.sh
index 7efc65c73b80b729610ebddf60d2de69eba267b1,f604fb5b2c7dc661d649e49b9048413dc759244f..36d7799ebfb27e120875130f95ac35daed6c956b
@@@ -22,15 -22,9 +22,15 @@@ BUILD_TARGET=${1:-none
  ##Do we need to create the final archive
  ARCHIVE_FOR_DISTRIBUTION=1
  ##Which version name are we appending to the final archive
- export BUILD_NAME=15.01-RC10
+ export BUILD_NAME=15.01-RC11
  TARGET_DIR=Cura-${BUILD_NAME}-${BUILD_TARGET}
  
 +##Revision
 +export REVISION=1.19
 +
 +##Git commit
 +GIT_HASH=$(git rev-parse --short=4 HEAD)
 +
  ##Which versions of external programs to use
  WIN_PORTABLE_PY_VERSION=2.7.2.1