Douglas Gregor ha escrito:
On Dec 9, 2005, at 1:37 PM, Joaquin M Lopez Munoz wrote:
Doug Gregor <doug.gregor <at> gmail.com> writes:
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...
I've just checked it out, and there're some recently modified files in libs/multi_index/ that didn't get merged from RC_1_33_0 to HEAD (for an example, see http://tinyurl.com/cznm2) Is this intentional or just an overlook? I can do the merge myself, but I'm afraid there could be some more unintended leftovers in other libs and nobody would notice.
I tried to point out all of the things that I wasn't able to merge (because of conflicts), but obviously I missed something. Sorry!
Nothing to be sorry about. Thank you for managing such a neverending release!
Can you handle the merge for multi_index?
It's already done. FYI, I didn't have any conflicts, I cannot guess what stopped you from merging on your first try. Are we sure everything else is already merged? Best, Joaquín M López Muñoz Telefónica, Investigación y Desarrollo