Merge commit 'origin/core43'

Conflicts:
	lfs/openssl
	make.sh
This commit is contained in:
Arne Fitzenreiter
2010-12-03 18:56:37 +01:00
3 changed files with 7 additions and 4 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