From: Youness Alaoui <kakaroto@kakaroto.homelinux.net>
Date: Fri, 6 Mar 2015 18:05:26 +0000 (-0500)
Subject: Merge tag '15.01-RC10' into upstream
X-Git-Tag: lulzbot-15.02.1-1.01~41
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=300af826e11b3dbcd73696b2afc6b2f14296f343;p=cura.git

Merge tag '15.01-RC10' into upstream
---

300af826e11b3dbcd73696b2afc6b2f14296f343
diff --cc package.sh
index 092901f1,41802105..7efc65c7
--- a/package.sh
+++ b/package.sh
@@@ -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-RC9
+ export BUILD_NAME=15.01-RC10
  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