?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 1f6b377 5571b7a)
Merge branch 'VLAN-MultiSSID' into Teaman-ND
commitf99eaf8e9bf951de3c6c4058729e906909d493c1
authorAugusto Bott <augusto@bott.com.br>
Wed, 11 Apr 2012 10:08:34 +0000 (11 07:08 -0300)
committerAugusto Bott <augusto@bott.com.br>
Wed, 11 Apr 2012 10:08:34 +0000 (11 07:08 -0300)
treeca1b4c943f47609919ad3fd590d1b31d4a5327a7tree
parent1f6b3771eb2d5be084ee3ad712426fcfd70d28b4commit | diff
parent5571b7a23ba91fa72e3711f6448cb4037f7656ebcommit | diff
Merge branch 'VLAN-MultiSSID' into Teaman-ND

* VLAN-MultiSSID:
  EXPERIMENTAL VLAN/VID mapping GUI
  robocfg: quick fix for segfaults on K24

Conflicts:
release/src/router/www/advanced-vlan.asp
release/src/router/httpd/tomato.c diff1 |  diff2 |  blob | history
release/src/router/rc/interface.c diff1 |  diff2 |  blob | history
release/src/router/rc/network.c diff1 |  diff2 |  blob | history
release/src/router/rc/wan.c diff1 |  diff2 |  blob | history
release/src/router/utils/robocfg.c diff1 |  diff2 |  blob | history
Tomato firmware and modifications.