Merge branch 'ddns' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 8 Jul 2014 14:19:31 +0000 (16:19 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 8 Jul 2014 14:19:31 +0000 (16:19 +0200)
1  2 
config/rootfiles/core/80/filelists/files
config/rootfiles/core/80/update.sh
make.sh

@@@ -1,10 -1,8 +1,9 @@@
  etc/system-release
  etc/issue
  etc/rc.d/init.d/dhcrelay
 +etc/rc.d/init.d/dnsmasq
  srv/web/ipfire/cgi-bin/ovpnmain.cgi
  srv/web/ipfire/cgi-bin/routing.cgi
- usr/local/bin/setddns.pl
  usr/sbin/dhcrelay
  var/ipfire/general-functions.pl
  var/ipfire/langs
Simple merge
diff --cc make.sh
Simple merge