| commit | 8a868ff6f5079d460ca85d23c5baf0a305ad9f3b | |
| author | Shibby <shibby@openlinksys.info> | |
| Mon, 25 Jul 2011 11:23:00 +0000 (25 13:23 +0200) | ||
| committer | Shibby <shibby@openlinksys.info> | |
| Mon, 25 Jul 2011 11:23:00 +0000 (25 13:23 +0200) | ||
| tree | db69573eff8b1709c352c6fe851dbbed743c76a4 | tree |
| parent | fe4f2fc780f45e4ddc989276bd80ae4002bc3636 | commitdiff |
| parent | 8db0864f432a35550df744d79ab8b0139c50525b | commitdiff |
Merge commit 'origin/VLAN-GUI' into tomato-shibby
Conflicts:
release/src/router/httpd/httpd.c
release/src/router/rc/firewall.c
release/src/router/rc/services.c
release/src/router/www/about.asp
release/src/router/www/basic-network.asp
Conflicts:
release/src/router/httpd/httpd.c
release/src/router/rc/firewall.c
release/src/router/rc/services.c
release/src/router/www/about.asp
release/src/router/www/basic-network.asp
15 files changed: