merge && test for master

This commit is contained in:
Carl-Benedikt Krüger 2011-08-02 15:13:20 +02:00
parent 6c9d0f6b08
commit d963bb694c

View file

@ -154,8 +154,8 @@ int network_init(void)
#endif
// start echo and ping server
echo_init();
ping_init();
// echo_init();
// ping_init();
#endif
return 0;