mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-27 19:23:24 +02:00
Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x
Conflicts: config/rootfiles/core/29/filelists/files
This commit is contained in:
@@ -59,6 +59,7 @@ lib/firmware/ti_5052.fw
|
||||
lib/firmware/tr_smctr.bin
|
||||
#lib/firmware/ttusb-budget
|
||||
lib/firmware/ttusb-budget/dspbootcode.bin
|
||||
lib/firmware/av7110/bootcode.bin
|
||||
#lib/firmware/vicam
|
||||
lib/firmware/vicam/firmware.fw
|
||||
lib/firmware/whiteheat.fw
|
||||
|
||||
@@ -7,3 +7,6 @@ srv/web/ipfire/html/blob.gif
|
||||
srv/web/ipfire/html/images/info.gif
|
||||
srv/web/ipfire/html/images/openvpn.png
|
||||
var/ipfire/menu.d/50-firewall.menu
|
||||
lib/firmware/av7110/bootcode.bin
|
||||
var/ipfire/backup/include
|
||||
etc/rc.d/init.d/networking/red
|
||||
|
||||
Reference in New Issue
Block a user