webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 03:07:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
Conflicts:
	make.sh
This commit is contained in:
Arne Fitzenreiter
2011-09-07 14:01:27 +02:00
parent 39b14828ca 6d7da25360
commit ea1fa59632
6 changed files with 71 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
make.sh
View File

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