From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 3 Dec 2010 17:56:37 +0000 (+0100)
Subject: Merge commit 'origin/core43'
X-Git-Tag: v2.9-beta1~23^2~21
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=51cac9a1ce8b4baa0a214f7674d8a915a8030560

Merge commit 'origin/core43'

Conflicts:
	lfs/openssl
	make.sh
---

51cac9a1ce8b4baa0a214f7674d8a915a8030560
diff --cc make.sh
index 4d49eaaf3a,42a188ac23..979215cfd8
--- a/make.sh
+++ b/make.sh
@@@ -24,9 -24,9 +24,9 @@@
  
  NAME="IPFire"							# Software name
  SNAME="ipfire"							# Short name
 -VERSION="2.7"							# Version number
 -CORE="43"							# Core Level (Filename)
 +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