Merge branch 'Teaman-ND' into Toastman-IPT-NDToastman-1.28.7633
commitc782d7c38fd07cbf1217cf64a0240c453196f44d
authorToastman <toastman@galactic_core>
Mon, 27 Feb 2012 06:16:50 +0000 (27 13:16 +0700)
committerToastman <toastman@galactic_core>
Mon, 27 Feb 2012 06:16:50 +0000 (27 13:16 +0700)
tree480632a8c8e88376ecc762ae03049f29d332842f
parent8466434907c9283e39d94e168850ce6badcec93f
parentbfcb09382dd43b239cf00902f5130baa9a9d6855
Merge branch 'Teaman-ND' into Toastman-IPT-ND
18 files changed:
release/src/linux/linux/arch/mips/bcm947xx/time.c
release/src/router/httpd/Makefile
release/src/router/httpd/tomato.c
release/src/router/nvram/defaults.c
release/src/router/rc/arpbind.c
release/src/router/rc/firewall.c
release/src/router/rc/services.c
release/src/router/www/Makefile
release/src/router/www/advanced-vlan.asp
release/src/router/www/basic-network.asp
release/src/router/www/basic-static.asp
release/src/router/www/basic-time.asp
release/src/router/www/forward-upnp.asp
release/src/router/www/ipt-24.asp
release/src/router/www/ipt-realtime.asp
release/src/router/www/status-data.jsx
release/src/router/www/status-overview.asp
release/src/router/www/tomato.js