mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-28 03:33:25 +02:00
Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
Conflicts: config/rootfiles/core/35/filelists/files
This commit is contained in:
@@ -11,3 +11,5 @@ 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
|
||||
|
||||
Reference in New Issue
Block a user