Merge branch 'master' into upnp

This commit is contained in:
Michael Tremer
2010-11-22 13:23:00 +01:00
16 changed files with 79 additions and 19 deletions

View File

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