[boost] Merge conflicts for release

From: David Abrahams (david.abrahams_at_[hidden])
Date: 2002-05-15 19:25:30

The following files exhibit merge conflicts from the RC_1_28_0 branch:

              Conflict                boost/function/function_base.hpp
              Conflict                boost/function/function_template.hpp
              Conflict                boost/regex/config.hpp
              Conflict                libs/function/doc/tutorial.html
              Conflict                more/mailing_lists.htm
              Conflict                tools/build/index.html

I'm not sure about the first 4; I leave those to Doug and John to resolve
in the main trunk.

As for more/mailing_lists.htm, it looks like version 1.5.2.2 should have
been tagged with RC_1_28_0_last_merge, but wasn't. I'll resolve that myself
by first moving the tag.

I don't understand the problem with tools/build/index.html; everything
looks right but there are still merge conflicts.

-Dave

+---------------------------------------------------------------+
                  David Abrahams
      C++ Booster (http://www.boost.org)               O__  ==
      Pythonista (http://www.python.org)              c/ /'_ ==
  resume: http://users.rcn.com/abrahams/resume.html  (*) \(*) ==
          email: david.abrahams_at_[hidden]
+---------------------------------------------------------------+