Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

This commit is contained in:
Christian Schmidt
2010-12-06 18:47:29 +01:00
51 changed files with 166 additions and 44 deletions

View File

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