Merge remote-tracking branch 'origin/next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 1 Dec 2014 08:51:40 +0000 (09:51 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 1 Dec 2014 08:51:40 +0000 (09:51 +0100)
Conflicts:
make.sh

1  2 
make.sh

diff --cc make.sh
+++ b/make.sh
@@@ -24,8 -24,8 +24,8 @@@
  
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
- VERSION="2.15"                                                        # Version number
- CORE="85"                                                     # Core Level (Filename)
+ VERSION="2.17"                                                        # Version number
 -CORE="86"                                                     # Core Level (Filename)
++CORE="86test1"                                                        # Core Level (Filename)
  PAKFIRE_CORE="85"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                  # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan