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:
Michael Tremer
2009-07-06 20:04:39 +02:00
5 changed files with 12 additions and 4 deletions

View File

@@ -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

View File

@@ -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