Changeset 59ecd4a in mainline for uspace/app/nettest1/nettest1.c

Timestamp:

2010-04-04T21:41:47Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5db9084

Parents:

36a75a2 (diff), ee7e82a9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/app/nettest1/nettest1.c (moved) (moved from uspace/srv/net/app/nettest1/nettest1.c ) (1 diff)

uspace/app/nettest1/nettest1.c

@@ -41 +41 @@
 #include <time.h>
 
-#include "../../include/in.h"
-#include "../../include/in6.h"
-#include "../../include/inet.h"
-#include "../../include/socket.h"
-
-#include "../../err.h"
-
-#include "../nettest.h"
-#include "../parse.h"
-#include "../print_error.h"
+#include <in.h>
+#include <in6.h>
+#include <inet.h>
+#include <socket.h>
+#include <net_err.h>
+
+#include "nettest.h"
+#include "parse.h"
+#include "print_error.h"
 
 /** Echo module name.