1.1 --- a/.hgtags	Thu Apr 02 23:34:42 2009 -0700
     1.2 +++ b/.hgtags	Thu Apr 02 23:43:38 2009 -0700
     1.3 @@ -31,3 +31,4 @@
     1.4  58ae52c5845ff03ba08dc921e13e6cf3604c810a ns-3.3-RC5
     1.5  4267fd454004f5a60e517496f43a01000ccebc72 ns-3.3-RC6
     1.6  2efae18e73794c0acd8061a9bd5c74b69f1b0d93 ns-3.3
     1.7 +5396ecd09060bcb1e7b1f750bb170cbfde7a77c2 ns-3.4

     2.1 --- a/AUTHORS	Thu Apr 02 23:34:42 2009 -0700
     2.2 +++ b/AUTHORS	Thu Apr 02 23:43:38 2009 -0700
     2.3 @@ -14,4 +14,14 @@
     2.4  Mehdi Benamor (mehdi.benamor@telecom-bretagne.eu)
     2.5  Angelos Chatzipapas (chatzipa@ceid.upatras.gr)
     2.6  Luis Cortes (cortes@gatech.edu)
     2.7 +Kulin Shah (m.kulin@gmail.com)
     2.8 +Sam Jansen (sam.jansen@gmail.com)
     2.9 +Timo Bingmann (timo.bingmann@student.kit.edu)
    2.10 +Kirill V. Andreev (kirillano@yandex.ru)
    2.11 +Providence Salumu Munga (Providence.Salumu@gmail.com, Providence.Salumu_Munga@it-sudparis.eu)
    2.12 +Mauro Tortonesi (mauro.tortonesi@unife.it)
    2.13 +Aleksey Kovalenko (kovalenko@iitp.ru)
    2.14 +Liu Jian (liujatp@gmail.com)
    2.15 +Andrey Hippo (ahippo@yandex.ru)
    2.16 +Francesco Malandrino (francesco.malandrino@gmail.com)
    2.17  

     3.1 --- a/regression.py	Thu Apr 02 23:34:42 2009 -0700
     3.2 +++ b/regression.py	Thu Apr 02 23:43:38 2009 -0700
     3.3 @@ -3,7 +3,7 @@
     3.4  import sys
     3.5  import shutil
     3.6  import pproc as subprocess
     3.7 -import urllib
     3.8 +import errno
     3.9  
    3.10  # WAF modules
    3.11  import Build
    3.12 @@ -118,7 +118,11 @@
    3.13  
    3.14          if Options.options.regression_generate:
    3.15              # clean the target dir
    3.16 -            shutil.rmtree(reference_traces_path, ignore_errors=True)
    3.17 +            try:
    3.18 +                shutil.rmtree(trace_output_path)
    3.19 +            except OSError, ex:
    3.20 +                if ex.errno not in [errno.ENOENT]:
    3.21 +                    raise
    3.22              os.makedirs(reference_traces_path)
    3.23              result = self.run_reference_generate(reference_traces_path, program, arguments, is_pyscript)
    3.24              if result == 0:
    3.25 @@ -127,7 +131,11 @@
    3.26                  print "GENERATE FAIL " + self.test_name
    3.27          else:
    3.28              # clean the target dir
    3.29 -            shutil.rmtree(trace_output_path, ignore_errors=True)
    3.30 +            try:
    3.31 +                shutil.rmtree(trace_output_path)
    3.32 +            except OSError, ex:
    3.33 +                if ex.errno not in [errno.ENOENT]:
    3.34 +                    raise
    3.35              os.makedirs(trace_output_path)
    3.36              # run it
    3.37              result = self.run_reference_test(reference_traces_path, trace_output_path, program, arguments, is_pyscript)

     4.1 --- a/src/helper/wscript	Thu Apr 02 23:34:42 2009 -0700
     4.2 +++ b/src/helper/wscript	Thu Apr 02 23:43:38 2009 -0700
     4.3 @@ -1,7 +1,7 @@
     4.4  ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
     4.5  
     4.6  def build(bld):
     4.7 -    helper = bld.create_ns3_module('helper', ['internet-stack', 'wifi', 'point-to-point', 'csma', 'olsr', 'global-routing', 'onoff', 'packet-sink', 'udp-echo', 'uan'])
     4.8 +    helper = bld.create_ns3_module('helper', ['internet-stack', 'wifi', 'point-to-point', 'csma', 'olsr', 'global-routing', 'onoff', 'packet-sink', 'udp-echo'])
     4.9      helper.source = [
    4.10          'node-container.cc',
    4.11          'net-device-container.cc',
    4.12 @@ -21,7 +21,6 @@
    4.13          'ipv4-interface-container.cc',
    4.14          'udp-echo-helper.cc',
    4.15          'bridge-helper.cc',
    4.16 -        'uan-helper.cc',
    4.17          'yans-wifi-helper.cc',
    4.18          'v4ping-helper.cc',
    4.19          ]
    4.20 @@ -47,7 +46,6 @@
    4.21          'ipv4-interface-container.h',
    4.22          'udp-echo-helper.h',
    4.23          'bridge-helper.h',
    4.24 -        'uan-helper.h',
    4.25          'yans-wifi-helper.h',
    4.26          'v4ping-helper.h',
    4.27          ]

     5.1 --- a/src/wscript	Thu Apr 02 23:34:42 2009 -0700
     5.2 +++ b/src/wscript	Thu Apr 02 23:43:38 2009 -0700
     5.3 @@ -33,7 +33,6 @@
     5.4      'devices/wifi',
     5.5      'helper',
     5.6      'contrib/stats',
     5.7 -    'devices/uan',
     5.8      'applications/v4ping',
     5.9      )
    5.10  

     6.1 --- a/wscript	Thu Apr 02 23:34:42 2009 -0700
     6.2 +++ b/wscript	Thu Apr 02 23:43:38 2009 -0700
     6.3 @@ -395,7 +395,7 @@
     6.4      print "Entering directory `%s'" % os.path.join(bld.path.abspath(), 'build')
     6.5      # process subfolders from here
     6.6      bld.add_subdirs('src')
     6.7 -    bld.add_subdirs('samples utils examples uan-apps')
     6.8 +    bld.add_subdirs('samples utils examples')
     6.9  
    6.10      add_scratch_programs(bld)
    6.11