| commit | 8748f74011e6a619b413f0dbb0722138039e6a36 | |
| author | Augusto Bott <augusto@bott.com.br> | |
| Thu, 3 Nov 2011 02:50:09 +0000 (3 00:50 -0200) | ||
| committer | Augusto Bott <augusto@bott.com.br> | |
| Thu, 3 Nov 2011 02:50:09 +0000 (3 00:50 -0200) | ||
| tree | 388b7e4e4b2a3348b19c440981a98ee0af7621c2 | tree |
| parent | 15ec9d0fd7ba20292f19ce1cf6d3803f07b2aeee | commitdiff |
| parent | c084fb507c879f2258a3c314503ea9f9d9fed4f1 | commitdiff |
Merge branch 'VLAN-GUI' into Teaman-ND
* VLAN-GUI:
Status/Device List: don't assume any/all active DHCP leases are on/from br0
LAN access: new/revised iptables ruleset
Option to include (or not) VLAN-GUI
Increased netmask size/limit for LAN subnets
Conflicts:
release/src/Makefile
release/src/router/config/config.in
release/src/router/config_base
release/src/router/rc/wnas.c
release/src/router/www/Makefile
release/src/router/www/basic-network.asp
release/src/router/www/status-overview.asp
* VLAN-GUI:
Status/Device List: don't assume any/all active DHCP leases are on/from br0
LAN access: new/revised iptables ruleset
Option to include (or not) VLAN-GUI
Increased netmask size/limit for LAN subnets
Conflicts:
release/src/Makefile
release/src/router/config/config.in
release/src/router/config_base
release/src/router/rc/wnas.c
release/src/router/www/Makefile
release/src/router/www/basic-network.asp
release/src/router/www/status-overview.asp
16 files changed: