Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 6 Jul 2009 18:04:39 +0000 (20:04 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 6 Jul 2009 18:04:39 +0000 (20:04 +0200)
Conflicts:
config/rootfiles/core/29/filelists/files

1  2 
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