[Ns-commits] ns-3-dev

[code@nsnam.ece.gatech.edu]

---- Upgrade to WAF 1.5.4
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: bindings/python/waf bindings/python/wscript regression.py src/wscript waf wscript wutils.py
url: http://code.nsnam.org/ns-3-dev/rev/179f86838e62


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