[Ns-commits] ns-3-dev

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

---- Change default WiFi ProbeRequestTimeout to 50 ms; closes bug #199.
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: src/devices/wifi/nqsta-wifi-mac.cc
url: http://code.nsnam.org/ns-3-dev/rev/231895d89769


---- merge
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: 
url: http://code.nsnam.org/ns-3-dev/rev/5aa8fd647c24