merge with ns-3-dev

2007-09-12 18:06:09 +01:00
parent 92313a2d64 644fffd69f
commit 3e77a6301d
72 changed files with 4207 additions and 1017 deletions
--- a/examples/wscript
+++ b/examples/wscript
@@ -22,6 +22,10 @@ def build(bld):
        ['csma', 'internet-node'])
    obj.source = 'csma-packet-socket.cc'

+    obj = bld.create_ns3_program('csma-multicast',
+        ['csma', 'internet-node'])
+    obj.source = 'csma-multicast.cc'
+
    obj = bld.create_ns3_program( 'mixed-global-routing',
        ['point-to-point', 'internet-node', 'global-routing' , 'csma-cd'])
    obj.source = 'mixed-global-routing.cc'