>>>>> "Andre" == Andre Poenitz <[EMAIL PROTECTED]> writes:
Andre> It compiles again but I am notoriously bad at fixing merging Andre> conflicts. Andre> Please apply the uncontroversial parts. I applied the parts which are not related to Paragraph::pos_type. Unfortunately, this is on 10% of the patch, and does not reduce compile times (mostly reformatting). Here is what I am left with. Lars, do you like this one? JMarc
src3-notapplied.diff.gz
Description: Binary data
