| commit | 7bdc101e79b6c7b7b85abc5754f3055d2e0a173f | |
| author | Augusto Bott <augusto@bott.com.br> | |
| Wed, 18 Jan 2012 11:46:50 +0000 (18 09:46 -0200) | ||
| committer | Augusto Bott <augusto@bott.com.br> | |
| Wed, 18 Jan 2012 11:46:50 +0000 (18 09:46 -0200) | ||
| tree | 3075b65cc4193ad9b7bdf93b7eafb2fbb4b3e3f5 | tree |
| parent | f0243ea04690149da9c4e2d138f1aa3ba2d6690d | commitdiff |
| parent | 4f54afbeb9ee1d6571aac593f1b1a3142b6d53de | commitdiff |
Merge branch 'Teaman-ND' into Teaman-ND-SDHC
* Teaman-ND:
MultiSSID: up to 4 WL VIFs per physical interface allowed on WebUI
Ditch IP Traffic pie charts page (ipt-graphs.asp)
EXPERIMENTAL Web UI for multiple virtual/guest WLANs
webUI/firewall: no sense in having "Route Modem IP" option for WL client
Fix infinite loop in SendResp_upnphttp()
rc/firewall: reorg ipt_account rules creation (revert)
Static ARP: minor improvement in the code
WebUI: bugfix on forward/upnp page
WebUI: cosmetics
* Teaman-ND:
MultiSSID: up to 4 WL VIFs per physical interface allowed on WebUI
Ditch IP Traffic pie charts page (ipt-graphs.asp)
EXPERIMENTAL Web UI for multiple virtual/guest WLANs
webUI/firewall: no sense in having "Route Modem IP" option for WL client
Fix infinite loop in SendResp_upnphttp()
rc/firewall: reorg ipt_account rules creation (revert)
Static ARP: minor improvement in the code
WebUI: bugfix on forward/upnp page
WebUI: cosmetics