From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 20 Apr 2009 17:39:10 +0000 (+0200)
Subject: Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
X-Git-Tag: v2.5-beta1~15
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=3731c3daa75962346a6b2901c25c9f012f177c44

Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x

Conflicts:
	make.sh
---

3731c3daa75962346a6b2901c25c9f012f177c44
diff --cc make.sh
index 30bf69ff31,dadf2ff6e5..b15bf80719
--- a/make.sh
+++ b/make.sh
@@@ -345,8 -345,7 +345,9 @@@ buildipfire() 
    ipfiremake alsa			KMOD=1
    ipfiremake openswan			KMOD=1
    ipfiremake mISDN
 +  ipfiremake which
 +  ipfiremake compat-wireless
+   ipfiremake linux			XEN=1
    ipfiremake pkg-config
    ipfiremake linux-atm
    ipfiremake cpio