Public Git Hosting - tomato.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 1b10af9 3826464)

commit	8216c05b0b6041b3af33b374e2c1c8bfd870bec1
author	Toastman <toastman@galactic.core>
	Thu, 28 Jul 2011 04:17:12 +0000 (28 11:17 +0700)
committer	Toastman <toastman@galactic.core>
	Thu, 28 Jul 2011 04:17:12 +0000 (28 11:17 +0700)
tree	ac88b61070f9bf0c032a28ee41ce8cbd08f66fad	tree
parent	1b10af95027ee6ea2c2feca759cb7e53dc30b069	commit \| diff
parent	382646465fad9a638b756107f363e1436be019a6	commit \| diff

Merge branch 'VLAN-GUI' into Toastman-RT

14 files changed:

release/src/router/httpd/httpd.c	diff1 \|	diff2 \|	blob \| history
release/src/router/httpd/tomato.c	diff1 \|	diff2 \|	blob \| history
release/src/router/nvram/defaults.c	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/firewall.c	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/network.c	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/services.c	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/wan.c	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/wnas.c	diff1 \|	diff2 \|	blob \| history
release/src/router/shared/misc.c	diff1 \|	diff2 \|	blob \| history
release/src/router/www/about.asp	diff1 \|	diff2 \|	blob \| history
release/src/router/www/basic-network.asp	diff1 \|	diff2 \|	blob \| history
release/src/router/www/status-data.jsx	diff1 \|	diff2 \|	blob \| history
release/src/router/www/status-overview.asp	diff1 \|	diff2 \|	blob \| history
release/src/router/www/tomato.js	diff1 \|	diff2 \|	blob \| history

Tomato firmware and modifications.