| commit | d5ca99d36caeb39f22ea915e1662bfac4af3eb27 | |
| author | Augusto Bott <augusto@bott.com.br> | |
| Wed, 7 Dec 2011 06:36:49 +0000 (7 04:36 -0200) | ||
| committer | Augusto Bott <augusto@bott.com.br> | |
| Wed, 7 Dec 2011 06:36:49 +0000 (7 04:36 -0200) | ||
| tree | 5e64868f0f68bb2e2985bde535b111467863eeb1 | tree |
| parent | bcc797fdc3feefdea491d4415b5016e76a6f7944 | commitdiff |
| parent | c7546fdc92dca37c6ae9abe2b55df2a8fdeb260e | commitdiff |
Merge branch 'VLAN-GUI' into VLAN-MultiSSID
* VLAN-GUI:
Fix issues with 'disappearing' WL ifaces (when not assigned as part of any LAN bridges)
Conflicts:
release/src/router/httpd/wl.c
release/src/router/www/advanced-vlan.asp
release/src/router/www/status-overview.asp
* VLAN-GUI:
Fix issues with 'disappearing' WL ifaces (when not assigned as part of any LAN bridges)
Conflicts:
release/src/router/httpd/wl.c
release/src/router/www/advanced-vlan.asp
release/src/router/www/status-overview.asp