From: Youness Alaoui <kakaroto@kakaroto.homelinux.net>
Date: Tue, 3 Mar 2015 18:16:16 +0000 (-0500)
Subject: Merge tag '15.01-RC2' into upstream
X-Git-Tag: lulzbot-15.02.1-1.01~59
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=fe5ccd83372d148b1519dd27dbb89ef11dedb1cf;p=cura.git

Merge tag '15.01-RC2' into upstream
---

fe5ccd83372d148b1519dd27dbb89ef11dedb1cf
diff --cc package.sh
index 72557fc6,5234e64a..17a06cdb
--- a/package.sh
+++ b/package.sh
@@@ -19,15 -19,9 +19,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-RC1
+ export BUILD_NAME=15.01-RC2
  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