[Insight-developers] Merge from beta branch

Brad King brad.king@kitware.com
Thu, 7 Feb 2002 17:59:30 -0500 (EST)


Hello, all:

Today I merged the changes from the beta branch into the main tree. I have
added a new tag to the beta branch called

release-0_5-beta-merge1

I merged the changes made on the branch between its start and this tag
into the main tree.  If any further changes are made to the branch, they
should be merged into the main tree relative to this tag.

Anyone who was involved with changes on the branch, please check your
files in the main tree to be sure the changes were integrated properly.  

After merging the changes with CVS, I read through all the modified and
removed conflicts by hand.  I then ran an experimental build (without
submitting it) to make sure there were no errors, and committed the
changes.

-Brad