merge

2009-05-30 17:37:38 +01:00
parent 5839b484bb ddb42cdc0d
commit 3cc72e4626
148 changed files with 7813 additions and 4822 deletions
--- a/examples/wscript
+++ b/examples/wscript
@@ -120,6 +120,10 @@ def build(bld):
                                 ['core', 'simulator', 'mobility', 'wifi'])
    obj.source = 'wifi-adhoc.cc'

+    obj = bld.create_ns3_program('wifi-clear-channel-cmu',
+                                 ['core', 'simulator', 'mobility', 'wifi'])
+    obj.source = 'wifi-clear-channel-cmu.cc'
+
    obj = bld.create_ns3_program('wifi-ap',
                                 ['core', 'simulator', 'mobility', 'wifi'])
    obj.source = 'wifi-ap.cc'