Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 12 Jan 2010 18:28:18 +0000 (19:28 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 12 Jan 2010 18:28:18 +0000 (19:28 +0100)
Conflicts:
config/rootfiles/core/35/filelists/files

1  2 
config/rootfiles/core/35/filelists/files

@@@ -1,13 -1,4 +1,15 @@@
  etc/system-release
  srv/web/ipfire/cgi-bin/country.cgi
 -var/ipfire/outgoing/bin/outgoingfw.pl
 +etc/modprobe.d/hostap
 +lib/modules/2.6.27.42-ipfire/kernel/net/ieee80211/ieee80211.off
 +lib/modules/2.6.27.42-ipfire/kernel/net/ieee80211/ieee80211_crypt.off
 +lib/modules/2.6.27.42-ipfire/kernel/net/ieee80211/ieee80211_crypt_ccmp.off
 +lib/modules/2.6.27.42-ipfire/kernel/net/ieee80211/ieee80211_crypt_tkip.off
 +lib/modules/2.6.27.42-ipfire/kernel/net/ieee80211/ieee80211_crypt_wep.off
 +lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211.off
 +lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt.off
 +lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt_ccmp.off
 +lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt_tkip.off
 +lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt_wep.off
+ srv/web/ipfire/cgi-bin/outgoingfw.cgi
++var/ipfire/outgoing/bin/outgoingfw.pl