Merge branch 'master' into next

Conflicts:
	config/rootfiles/core/58/filelists/files
	make.sh

diff --git a/config/rootfiles/core/58/filelists/files b/config/rootfiles/core/58/filelists/files
index 047127e7e540163ff1e298e2f6e55a09b7b68574..19d98e57cf666d6bd31c6ce3da16b59942d92c45 100644 (file)
--- a/config/rootfiles/core/58/filelists/files
+++ b/config/rootfiles/core/58/filelists/files
@@ -1,7 +1,10 @@
 etc/system-release
 etc/issue
 etc/vimrc
+<<<<<<< HEAD
 srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 var/ipfire/general-functions.pl
 var/ipfire/langs
+=======
+>>>>>>> master

diff --git a/make.sh b/make.sh
index a720b627b01c35712a986990efc4664606cc220b..cc46b57b0d72ca14f3f0970ae0fad9d81d4846c4 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"                                                 # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.11"                                                 # Version number
 CORE="58"                                                      # Core Level (Filename)
-PAKFIRE_CORE="57"                                              # Core Level (PAKFIRE)
+PAKFIRE_CORE="58"                                              # 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