| commit | d9ef10101b3f35d984cbd104ef27fd086a123872 | |
| author | Augusto Bott <augusto@bott.com.br> | |
| Tue, 6 Dec 2011 05:55:19 +0000 (6 03:55 -0200) | ||
| committer | Augusto Bott <augusto@bott.com.br> | |
| Tue, 6 Dec 2011 05:55:19 +0000 (6 03:55 -0200) | ||
| tree | b8aa422dcb1f561743f8d2a0d8cd598e149c1303 | tree |
| parent | 2a0251176b483222e43301cda2e3fc45f015c8cf | commitdiff |
| parent | bcc797fdc3feefdea491d4415b5016e76a6f7944 | commitdiff |
Merge branch 'VLAN-MultiSSID' into Teaman-ND
* VLAN-MultiSSID:
Fix different DHCP lease times for each LAN bridge
/etc/hosts completeness
Lan Access: reordering of FORWARD iptables rules creation
Conflicts:
release/src/router/rc/firewall.c
release/src/router/rc/services.c
* VLAN-MultiSSID:
Fix different DHCP lease times for each LAN bridge
/etc/hosts completeness
Lan Access: reordering of FORWARD iptables rules creation
Conflicts:
release/src/router/rc/firewall.c
release/src/router/rc/services.c
| release/src/router/rc/firewall.c | diff1 | diff2 | blobhistory |
| release/src/router/rc/network.c | diff1 | diff2 | blobhistory |
| release/src/router/rc/services.c | diff1 | diff2 | blobhistory |