| commit | b8ab745f7be73ce41fa5b5dd7c14537e07a73304 | |
| author | Augusto Bott <augusto@bott.com.br> | |
| Sun, 6 Nov 2011 07:17:38 +0000 (6 05:17 -0200) | ||
| committer | Augusto Bott <augusto@bott.com.br> | |
| Sun, 6 Nov 2011 07:17:38 +0000 (6 05:17 -0200) | ||
| tree | a936aba4a9e1ff21274aefb0338f47097d03e192 | tree |
| parent | 8748f74011e6a619b413f0dbb0722138039e6a36 | commitdiff |
| parent | c36e3dd432f993661955efe77828a5cb27eac580 | commitdiff |
Merge branch 'VLAN-MultiSSID' into Teaman-ND
* VLAN-MultiSSID:
WPA: revised nas startup code
Cosmetics: Status - Overview
SSID broadcast on status-overview.asp
Hostname completeness (status-devices.asp)
Conflicts:
release/src/router/rc/wnas.c
release/src/router/www/basic-network.asp
release/src/router/www/status-overview.asp
* VLAN-MultiSSID:
WPA: revised nas startup code
Cosmetics: Status - Overview
SSID broadcast on status-overview.asp
Hostname completeness (status-devices.asp)
Conflicts:
release/src/router/rc/wnas.c
release/src/router/www/basic-network.asp
release/src/router/www/status-overview.asp
| release/src/router/www/basic-network.asp | diff1 | diff2 | blobhistory |
| release/src/router/www/status-devices.asp | diff1 | diff2 | blobhistory |
| release/src/router/www/status-overview.asp | diff1 | diff2 | blobhistory |