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 remote-tracking branch 'origin/master' into next

Browse Source 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

Conflicts:
	make.sh
This commit is contained in:
Arne Fitzenreiter
2016-02-17 19:45:08 +01:00
parent 879458d41f 1ffbca6e4f
commit 802b916d10
82 changed files with 11701 additions and 271 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.17" # Version number
CORE="98" # Core Level (Filename)
PAKFIRE_CORE="97" # Core Level (PAKFIRE)
CORE="99" # Core Level (Filename)
PAKFIRE_CORE="98" # 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