Merge remote-tracking branch 'origin/master' into kernel-test

This commit is contained in:
Arne Fitzenreiter
2014-10-06 10:11:13 +02:00
131 changed files with 3076 additions and 5491 deletions

View File

@@ -25,8 +25,8 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.15" # Version number
CORE="83" # Core Level (Filename)
PAKFIRE_CORE="83" # Core Level (PAKFIRE)
CORE="84" # Core Level (Filename)
PAKFIRE_CORE="84" # 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