| commit | 61c88e3e9b4374b2ffefd5e2bbf1461250d19f9d | |
| author | Augusto Bott <augusto@bott.com.br> | |
| Fri, 6 Apr 2012 16:34:43 +0000 (6 13:34 -0300) | ||
| committer | Augusto Bott <augusto@bott.com.br> | |
| Fri, 6 Apr 2012 16:34:43 +0000 (6 13:34 -0300) | ||
| tree | db0c027b559f68588d44d8177aa8c656b4ce3354 | tree |
| parent | c83af12c4a9bb830863027342bd60208d1a62f9a | commitdiff |
| parent | 2b759efa198cc98d5c20224fafdd49a6b4dd9727 | commitdiff |
Merge branch 'VLAN-GUI' into VLAN-MultiSSID
* VLAN-GUI:
firewall: allow DMZ-style forwarding to alternative LAN bridges
* VLAN-GUI:
firewall: allow DMZ-style forwarding to alternative LAN bridges
| release/src/router/httpd/tomato.c | diff1 | diff2 | blobhistory |
| release/src/router/nvram/defaults.c | diff1 | diff2 | blobhistory |