Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <Arne_F@ipfire.org>
Wed, 3 Oct 2012 14:50:36 +0000 (16:50 +0200)
committerArne Fitzenreiter <Arne_F@ipfire.org>
Wed, 3 Oct 2012 14:50:36 +0000 (16:50 +0200)
1  2 
make.sh

diff --cc make.sh
+++ b/make.sh
@@@ -24,9 -24,9 +24,9 @@@
  
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
 -VERSION="2.11"                                                        # Version number
 +VERSION="2.13"                                                        # Version number
  CORE="63"                                                     # Core Level (Filename)
- PAKFIRE_CORE="62"                                             # Core Level (PAKFIRE)
+ PAKFIRE_CORE="63"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir