Merge remote-tracking branch 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 4 Mar 2016 06:09:02 +0000 (07:09 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 4 Mar 2016 06:09:02 +0000 (07:09 +0100)
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
1  2 
config/rootfiles/oldcore/98/update.sh
make.sh

Simple merge
diff --cc make.sh
+++ b/make.sh
@@@ -25,8 -25,8 +25,8 @@@
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
  VERSION="2.17"                                                        # Version number
 -CORE="99"                                                     # Core Level (Filename)
 +CORE="100"                                                    # Core Level (Filename)
- PAKFIRE_CORE="98"                                             # Core Level (PAKFIRE)
+ PAKFIRE_CORE="99"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                  # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir