From: Youness Alaoui <kakaroto@kakaroto.homelinux.net>
Date: Thu, 5 Mar 2015 21:22:07 +0000 (-0500)
Subject: Merge tag '15.01-RC5' into upstream
X-Git-Tag: lulzbot-15.02.1-1.01~53
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=cura.git;a=commitdiff_plain;h=9d3afc7ff37410191357598a442b030fc9296bc3

Merge tag '15.01-RC5' into upstream
---

9d3afc7ff37410191357598a442b030fc9296bc3
diff --cc package.sh
index 7e77a787,14086e5b..b647b3e7
--- 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-RC4
+ export BUILD_NAME=15.01-RC5
  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