Fixed merge errors (I hope)
authorltracy
Fri Apr 03 00:07:22 2009 -0700 (10 months ago)
changeset 43136dbd1950cc01
parent 4312 97bfba5d3c12
child 4314 117358ba4b56
Fixed merge errors (I hope)
src/helper/wscript
src/wscript
wscript
     1.1 --- a/src/helper/wscript	Thu Apr 02 23:45:13 2009 -0700
     1.2 +++ b/src/helper/wscript	Fri Apr 03 00:07:22 2009 -0700
     1.3 @@ -23,6 +23,7 @@
     1.4          'bridge-helper.cc',
     1.5          'yans-wifi-helper.cc',
     1.6          'v4ping-helper.cc',
     1.7 +        'uan-helper.cc'
     1.8          ]
     1.9  
    1.10      headers = bld.new_task_gen('ns3header')
    1.11 @@ -48,6 +49,7 @@
    1.12          'bridge-helper.h',
    1.13          'yans-wifi-helper.h',
    1.14          'v4ping-helper.h',
    1.15 +        'uan-helper.h'
    1.16          ]
    1.17  
    1.18      env = bld.env_of_name('default')
     2.1 --- a/src/wscript	Thu Apr 02 23:45:13 2009 -0700
     2.2 +++ b/src/wscript	Fri Apr 03 00:07:22 2009 -0700
     2.3 @@ -34,6 +34,7 @@
     2.4      'helper',
     2.5      'contrib/stats',
     2.6      'applications/v4ping',
     2.7 +    'devices/uan'
     2.8      )
     2.9  
    2.10  def set_options(opt):
     3.1 --- a/wscript	Thu Apr 02 23:45:13 2009 -0700
     3.2 +++ b/wscript	Fri Apr 03 00:07:22 2009 -0700
     3.3 @@ -395,7 +395,7 @@
     3.4      print "Entering directory `%s'" % os.path.join(bld.path.abspath(), 'build')
     3.5      # process subfolders from here
     3.6      bld.add_subdirs('src')
     3.7 -    bld.add_subdirs('samples utils examples')
     3.8 +    bld.add_subdirs('samples utils examples uan-apps')
     3.9  
    3.10      add_scratch_programs(bld)
    3.11