[Ns-commits] ns-3-dev

[code@nsnam-code.ece.gatech.edu]

---- some additional debugging for addressing conflicts
user: Tom Henderson <tomh at tomh.org>
files: src/node/ipv4-address-generator.cc
url: http://code.nsnam.org/ns-3-dev/rev/a65404754cb7


---- Prevent internet stack helper from overwriting internet stack
user: Tom Henderson <tomh at tomh.org>
files: src/internet-node/internet-stack.cc
url: http://code.nsnam.org/ns-3-dev/rev/f8523d79a0b7


---- revive mixed-wireless example from Simutools tutorial
user: Tom Henderson <tomh at tomh.org>
files: examples/mixed-wireless.cc examples/wscript
url: http://code.nsnam.org/ns-3-dev/rev/cb77c96e6149