[Ns-developers] [ns3] merging trees

[Tom Henderson]

Mathieu Lacage wrote:
> hi,
> 
> Is there any objection against merging
> http://code.nsnam.org/mathieu/ns-3-tags ? I have just fixed a packet
> buffer bug (bug 179) in there so, it would probably nice to be able to
> merge this quickly.
> 
> I have also done a lot of debugging on this tree:
> http://code.nsnam.org/mathieu/ns-3-gtk over the past few days and fixed
> a bunch of memory-related here and there everywhere in the tree so, it
> might be nice to merge in the near future. If you do not use the code in
> src/contrib/gtk-*, that merge should not impact you so, I see this as a
> very low risk merge with a few upsides since it does fix a couple of
> bugs.
> 

Yes, I would also recommend to merge.

Tom