[Repast-developer] branches merged and committed

[Nick C. <nic...@ve...>]

Hi,

For those of you keeping score, I've merged the our two cvs branches.
The main (or 2.0) branch now contains the current working code. Any
changes should now be committed to this branch and not to the rel-1-x
branch where work has ceased. 

The merged code compiles and all the tests pass except for a few. Those
that don't pass I'm not sure if they are valid tests. I'll investigate
more tomorrow. The demo models seem to run, but I'll need to investigate
this fully.

Nick

-- 
Nick Collier 
Social Science Research Computing 
University of Chicago 
http://repast.sourceforge.net