[mnet-devel] more merging of newnet to HEAD

[Zooko O'Whielacronx]

Whoa.  Somehow that merge test I did earlier was *not* the full story.  
I thought that I cvs up'ed my HEAD sandbox before merging, but somehow when 
I did it again just now I got a whole bunch more conflicts.

--Z




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
mnet-devel mailing list
mnet-devel at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mnet-devel