Moved net/rime.h to net/rime/rime.h

apps/collect-view/collect-view.c

@@ -39,7 +39,7 @@
 
 #include "contiki.h"
 #include "net/rime/collect-neighbor.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/timesynch.h"
 #include "collect-view.h"
 

apps/deluge/deluge.c

@@ -41,7 +41,7 @@
  */
 
 #include "contiki.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "cfs/cfs.h"
 #include "loader/elfloader.h"
 #include "lib/crc16.h"

apps/deluge/deluge.h

@@ -40,7 +40,7 @@
 #ifndef DELUGE_H
 #define DELUGE_H
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 PROCESS_NAME(deluge_process);
 

apps/powertrace/powertrace.c

@@ -41,7 +41,7 @@
 #include "contiki-lib.h"
 #include "sys/compower.h"
 #include "powertrace.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 #include <stdio.h>
 #include <string.h>

apps/serial-shell/serial-shell.c

@@ -45,7 +45,7 @@
 #include "shell.h"
 
 #include "dev/serial-line.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 #include <stdio.h>
 #include <string.h>

apps/shell/shell-download.c

@@ -41,7 +41,7 @@
 #include "contiki.h"
 #include "shell.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "cfs/cfs.h"
 
 #include "dev/leds.h"

apps/shell/shell-netfile.c

@@ -39,7 +39,7 @@
 
 #include "contiki.h"
 #include "shell-netfile.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/rudolph0.h"
 #include "dev/leds.h"
 

apps/shell/shell-netperf.c

@@ -39,7 +39,7 @@
 
 #include "contiki.h"
 #include "shell-netperf.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "contiki-conf.h"
 
 #include <stdio.h>

apps/shell/shell-rime-debug-runicast.c

@@ -45,7 +45,7 @@
 
 #include "lib/random.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/route.h"
 #include "net/rime/trickle.h"
 

apps/shell/shell-rime-debug.c

@@ -45,7 +45,7 @@
 
 #include "lib/random.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/route.h"
 #include "net/rime/trickle.h"
 

apps/shell/shell-rime-neighbors.c

@@ -39,7 +39,7 @@
 
 #include <string.h>
 #include "shell.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 PROCESS(shell_neighbors_process, "neighbors");
 SHELL_COMMAND(neighbors_command,

apps/shell/shell-rime-netcmd.c

@@ -46,7 +46,7 @@
 #include "lib/crc16.h"
 #include "lib/random.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/route.h"
 #include "net/rime/trickle.h"
 

apps/shell/shell-rime-ping.c

@@ -39,7 +39,7 @@
 
 
 #include "shell.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 #include <string.h>
 #include <stdio.h>

apps/shell/shell-rime-sendcmd.c

@@ -39,7 +39,7 @@
 #include "lib/crc16.h"
 #include "lib/random.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/unicast.h"
 
 #include "net/rime/timesynch.h"

apps/shell/shell-rime-sniff.c

@@ -38,7 +38,7 @@
  */
 
 #include "shell.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 static uint8_t sniff_for_attributes;
 

apps/shell/shell-rime-unicast.c

@@ -45,7 +45,7 @@
 
 #include "lib/random.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/route.h"
 #include "net/rime/trickle.h"
 

apps/shell/shell-rime.c

@@ -46,7 +46,7 @@
 #include "lib/crc16.h"
 #include "lib/random.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/netstack.h"
 #include "net/rime/route.h"
 

apps/shell/shell-rsh.c

@@ -40,7 +40,7 @@
 #include "contiki.h"
 #include "shell.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/meshconn.h"
 
 #include <stdio.h>

apps/shell/shell-sendtest.c

@@ -39,7 +39,7 @@
 
 #include "contiki.h"
 #include "shell-ps.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 #include <stdio.h>
 #include <string.h>

apps/shell/shell-sky.c

@@ -42,7 +42,7 @@
 
 #include "dev/watchdog.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/netstack.h"
 #include "cc2420.h"
 #include "dev/leds.h"

apps/shell/shell.c

@@ -45,7 +45,7 @@
 #include "contiki.h"
 #include "contiki-lib.h"
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 #include "shell.h"