Boost :

Date view	Thread view	Subject view	Author view

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

Next message: John Maddock: "Re: [boost] aix & BOOST_REGEX_NO_EXTERNAL_TEMPLATES"
Previous message: Peter Dimov: "Re: [boost] RE: change to weak_ptr.hpp to compile under Builder C++ 5,etc"
In reply to: David Abrahams: "[boost] Merge conflicts for release"
Next in thread: Douglas Gregor: "Re: [boost] Merge conflicts for release"

> 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

Next message: John Maddock: "Re: [boost] aix & BOOST_REGEX_NO_EXTERNAL_TEMPLATES"
Previous message: Peter Dimov: "Re: [boost] RE: change to weak_ptr.hpp to compile under Builder C++ 5,etc"
In reply to: David Abrahams: "[boost] Merge conflicts for release"
Next in thread: Douglas Gregor: "Re: [boost] Merge conflicts for release"

Date view	Thread view	Subject view	Author view

Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk