| commit | 0c811e0b65d7899b7be4122eb22e0b2d0e4f14b5 | |
| author | Augusto Bott <augusto@bott.com.br> | |
| Mon, 12 Mar 2012 07:43:54 +0000 (12 04:43 -0300) | ||
| committer | Augusto Bott <augusto@bott.com.br> | |
| Mon, 12 Mar 2012 07:43:54 +0000 (12 04:43 -0300) | ||
| tree | 30d113cac935ce1b0a61547a31fcf5cb495ea19a | tree |
| parent | dbfc867ac6ff158750865a5a14f03233af00e628 | commitdiff |
| parent | 3ef7e67858ecff04caf8197e381fa8b7c68c668e | commitdiff |
Merge remote-tracking branch 'origin/Teaman-PPTP' into Teaman-ND
* origin/Teaman-PPTP:
PPTP Server for Tomato
K24: fix kernel compilation error
Conflicts:
release/src/Makefile
release/src/router/config/config.in
release/src/router/config_base
release/src/router/httpd/Makefile
release/src/router/httpd/tomato.c
release/src/router/rc/firewall.c
release/src/router/rc/rc.h
release/src/router/www/Makefile
release/src/router/www/about.asp
* origin/Teaman-PPTP:
PPTP Server for Tomato
K24: fix kernel compilation error
Conflicts:
release/src/Makefile
release/src/router/config/config.in
release/src/router/config_base
release/src/router/httpd/Makefile
release/src/router/httpd/tomato.c
release/src/router/rc/firewall.c
release/src/router/rc/rc.h
release/src/router/www/Makefile
release/src/router/www/about.asp
16 files changed: