branch merge

2008-05-21 19:00:38 -07:00
parent 72d054a867 e9e87c3232
commit 72dba0d456
71 changed files with 2828 additions and 2214 deletions
--- a/src/node/net-device.h
+++ b/src/node/net-device.h
@@ -32,7 +32,6 @@
 namespace ns3 {

 class Node;
-class TraceContext;
 class Channel;
 class Packet;

--- a/src/node/node.h
+++ b/src/node/node.h
@@ -29,7 +29,6 @@

 namespace ns3 {

-class TraceContext;
 class NetDevice;
 class Application;
 class Packet;