Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update

This commit is contained in:
Dirk Wagner
2014-10-15 22:35:24 +02:00
171 changed files with 7877 additions and 5582 deletions

View File

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