From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 10 Oct 2008 22:55:11 +0000 (+0200)
Subject: Merge branch 'master' into openswan
X-Git-Tag: v2.3-beta5~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76cde2851ef696455dbc496ed351320404061f11;p=ipfire-2.x.git

Merge branch 'master' into openswan

Conflicts:
	make.sh
---

76cde2851ef696455dbc496ed351320404061f11
diff --cc make.sh
index a6ebd3aefa,ffe637914b..6a1d8b9000
--- a/make.sh
+++ b/make.sh
@@@ -344,12 -344,12 +344,12 @@@ buildipfire() 
  #  ipfiremake sane		KMOD=1	SMP=1
  #  ipfiremake openswan		KMOD=1	SMP=1
    ipfiremake linux25
-   ipfiremake atl2			KVER=2.6.25.17
-   ipfiremake kqemu			KVER=2.6.25.17
-   ipfiremake v4l-dvb			KVER=2.6.25.17
-   ipfiremake madwifi			KVER=2.6.25.17
-   ipfiremake alsa		KMOD=1	KVER=2.6.25.17
-   ipfiremake openswan		KMOD=1	KVER=2.6.25.17
+   ipfiremake atl2			KVER=2.6.25.18
+   ipfiremake kqemu			KVER=2.6.25.18
+   ipfiremake v4l-dvb			KVER=2.6.25.18
+   ipfiremake madwifi			KVER=2.6.25.18
+   ipfiremake alsa		KMOD=1	KVER=2.6.25.18
 -#  ipfiremake openswan		KMOD=1	KVER=2.6.25.18
++  ipfiremake openswan		KMOD=1	KVER=2.6.25.18
    ipfiremake linux
    ipfiremake atl2
    ipfiremake r8168