[Ns-commits] ns-3-dev

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

---- Exit WAF after processing --python-scan to avoid incorrect builds, since WAF does not handle well files being generated into the source dir instead of the build dir
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: bindings/python/wscript
url: http://code.nsnam.org/ns-3-dev/rev/d5a2890666e3


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