Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki

This commit is contained in:
Joakim Eriksson 2012-03-09 01:11:21 -08:00
commit adff634b88
73 changed files with 412 additions and 527 deletions

View file

@ -157,7 +157,7 @@ exit(1);
argv += optind - 1;
if(argc != 2 && argc != 3) {
err(1, "usage: %s [-B baudrate] [-H] [-L] [-s siodev] [-t tundev] [-T] [-v verbosity] [-d delay] ipaddress", prog);
err(1, "usage: %s [-B baudrate] [-H] [-L] [-s siodev] [-t tundev] [-T] [-v verbosity] [-d delay] [-a serveraddress] [-p serverport] ipaddress", prog);
}
slip_config_ipaddr = argv[1];