Merge commit 'origin/core43'
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 3 Dec 2010 17:56:37 +0000 (18:56 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 3 Dec 2010 17:56:37 +0000 (18:56 +0100)
Conflicts:
lfs/openssl
make.sh

1  2 
config/rootfiles/oldcore/42/exclude
make.sh

Simple merge
diff --cc 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