Re: [boost] Important: RC_1_33_0 -> HEAD merge

From: Jonathan Turkanis (technews_at_[hidden])
Date: 2005-12-08 12:39:38

Doug Gregor wrote:
> Now that 1.33.1 is out and the RC_1_33_0 branch is most likely closed
> for good, I've merged many of the changes from the RC_1_33_0 branch
> back to HEAD so that we don't lose all of the minor tweaks we made at
> the end. For many changes, the merge was so trivial that I've just
> committed the results. However, some libraries seemed to get quite
> out-of-sync. This happens when changes were made on both HEAD and
> RC_1_33_0, and CVS can't figure out how to merge those changes. These
> libraries are:
>
> Date-Time
> Iostreams

It doesn't look too bad, but I won't have time to fix it for a day or two.

-- 
Jonathan Turkanis
www.kangaroologic.com