From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 30 Jun 2010 09:36:50 +0000 (+0200)
Subject: Merge branch 'master' into ppp-update
X-Git-Tag: v2.9-beta1~171^2~8^2~5^2
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=0b83e5a52e38b9d763f4236d3b1d20e3c79cf4e1;hp=-c

Merge branch 'master' into ppp-update
---

0b83e5a52e38b9d763f4236d3b1d20e3c79cf4e1
diff --combined make.sh
index 1f304e8c83,eb63bb4ff9..03806c824b
--- a/make.sh
+++ b/make.sh
@@@ -25,7 -25,7 +25,7 @@@
  NAME="IPFire"							# Software name
  SNAME="ipfire"							# Short name
  VERSION="2.7"							# Version number
- CORE="38"							# Core Level (Filename)
+ CORE="39"							# Core Level (Filename)
  PAKFIRE_CORE="38"						# Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
  SLOGAN="www.ipfire.org"						# Software slogan
@@@ -337,6 -337,7 +337,6 @@@ buildipfire() 
    ipfiremake libusb
    ipfiremake libpcap
    ipfiremake ppp
 -  ipfiremake rp-pppoe
    ipfiremake pptp
    ipfiremake unzip
    ipfiremake which