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

Merge remote-tracking branch 'origin/next' into fifteen

Browse Source 
Conflicts:
	config/rootfiles/core/70/exclude
	config/rootfiles/core/70/meta
	config/rootfiles/core/71/exclude
	config/rootfiles/core/71/meta
	config/rootfiles/core/72/filelists/strongswan
	config/rootfiles/core/72/meta
	config/rootfiles/core/73/exclude
	config/rootfiles/core/73/meta
	config/rootfiles/core/fifteen/exclude
	config/rootfiles/core/fifteen/filelists/strongswan
	config/rootfiles/core/fifteen/meta
	config/rootfiles/oldcore/70/exclude
	config/rootfiles/oldcore/70/meta
	config/rootfiles/oldcore/71/exclude
	config/rootfiles/oldcore/71/meta
	config/rootfiles/oldcore/72/filelists/strongswan
	config/rootfiles/oldcore/72/meta
	config/rootfiles/oldcore/73/exclude
	config/rootfiles/oldcore/73/filelists/GeoIP
	config/rootfiles/oldcore/73/filelists/hwdata
	config/rootfiles/oldcore/73/filelists/openssh
	config/rootfiles/oldcore/73/filelists/php
	config/rootfiles/oldcore/73/meta
This commit is contained in:
Arne Fitzenreiter
2013-12-30 13:55:34 +01:00
parent ba263fbbb9 b447d23666
commit 349b93f674
14 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
make.sh
View File

@@ -26,7 +26,7 @@ NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.13" # Version number
CORE="75" # Core Level (Filename)
PAKFIRE_CORE="74" # Core Level (PAKFIRE)
PAKFIRE_CORE="75" # 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