From: John Maddock (john_maddock_at_[hidden])
Date: 2002-05-16 06:19:28


> Conflict boost/regex/config.hpp

I think I applied the same change to both branches - just ignore the
conflict (don't merge that file).

John Maddock
http://ourworld.compuserve.com/homepages/john_maddock/index.htm