merge src/simulator into src/core; move src/core to new module layout

2011-02-18 16:05:39 -08:00
parent 9471e3121f
commit df07734f32
241 changed files with 358 additions and 386 deletions
--- a/examples/error-model/simple-error-model.cc
+++ b/examples/error-model/simple-error-model.cc
@@ -37,7 +37,7 @@
 #include <fstream>
 #include "ns3/core-module.h"
 #include "ns3/common-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv4-global-routing-helper.h"