[Ns-commits] craigdo/ns-3-emu

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

---- remove Node::GetFirstApplication checked in changeset 38b8549b1ad3 by mistake.
user: Mathieu Lacage <mathieu.lacage at sophia.inria.fr>
files: bindings/python/ns3_module_node.py src/node/node.cc src/node/node.h
url: http://code.nsnam.org/craigdo/ns-3-emu/rev/dacc57c5d31f


---- implement WifiNetDevice::SendFrom
user: Mathieu Lacage <mathieu.lacage at sophia.inria.fr>
files: src/devices/wifi/adhoc-wifi-mac.cc src/devices/wifi/adhoc-wifi-mac.h src/devices/wifi/nqap-wifi-mac.cc src/devices/wifi/nqap-wifi-mac.h src/devices/wifi/nqsta-wifi-mac.cc src/devices/wifi/nqsta-wifi-mac.h src/devices/wifi/wifi-mac.h src/devices/wifi/wifi-net-device.cc
url: http://code.nsnam.org/craigdo/ns-3-emu/rev/5ba130a7f519


---- merge with HEAD
user: Mathieu Lacage <mathieu.lacage at sophia.inria.fr>
files: 
url: http://code.nsnam.org/craigdo/ns-3-emu/rev/e101960f06de


---- ensure type is registered
user: Mathieu Lacage <mathieu.lacage at sophia.inria.fr>
files: src/devices/bridge/bridge-net-device.cc
url: http://code.nsnam.org/craigdo/ns-3-emu/rev/a6113320f46a


---- Rescan API (due to wifi changes to support bridging)
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: bindings/python/ns3_module_wifi.py
url: http://code.nsnam.org/craigdo/ns-3-emu/rev/b179468df160


---- remove uneeded virtual keyword
user: Mathieu Lacage <mathieu.lacage at sophia.inria.fr>
files: src/node/socket.h
url: http://code.nsnam.org/craigdo/ns-3-emu/rev/4bc5b06f92df


---- branch merge
user: Craig Dowell <craigdo at ee.washington.edu>
files: 
url: http://code.nsnam.org/craigdo/ns-3-emu/rev/bca610812633