From: Michael Tremer Date: Mon, 6 Jul 2009 18:04:39 +0000 (+0200) Subject: Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x X-Git-Tag: v2.5-core29~49^2 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=54585197dac3b4fb7413a25d035aba0dd179879e Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x Conflicts: config/rootfiles/core/29/filelists/files --- 54585197dac3b4fb7413a25d035aba0dd179879e diff --cc config/rootfiles/core/29/filelists/files index c969afedef,9b62cc7638..bba4e40d9e --- a/config/rootfiles/core/29/filelists/files +++ b/config/rootfiles/core/29/filelists/files @@@ -3,7 -3,10 +3,10 @@@ etc/system-releas srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/blob.gif -srv/web/ipfire/images/info.gif -srv/web/ipfire/images/openvpn.gif +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