merge with trunk

2007-08-04 17:17:23 +02:00
parent 8e1489d85b b080a339a6
commit a55fa0d833
25 changed files with 6032 additions and 13 deletions
--- a/src/internet-node/internet-node.cc
+++ b/src/internet-node/internet-node.cc
@@ -37,7 +37,6 @@

 namespace ns3 {

-
 InternetNode::InternetNode()
 {
  Construct ();
@@ -78,7 +77,6 @@ InternetNode::Construct (void)
  Object::AddInterface (ipv4L4Demux);
 }

-
 TraceResolver *
 InternetNode::DoCreateTraceResolver (TraceContext const &context)
 {