MG: could you check if i didn't screw anything up while fixing the merge
errors, before i 'fix' more? Don't know if I should have tagging
something or not ...
Marc
Op za, 25-12-2004 te 00:37 +0100, schreef J.M. Maurer:
> Hope i didn't fsck anything up
>
> Marc
>
> Merge from HEAD
>
> CVS:
> ----------------------------------------------------------------------
> CVS: Enter Log. Lines beginning with `CVS:' are removed automatically
> CVS:
> CVS: Committing in .
> CVS:
> CVS: Modified Files:
> CVS: Tag: JMM-DOUBLEGRAPHICS-1
> CVS: fl_AutoNum.cpp fl_FrameLayout.cpp fp_FootnoteContainer.cpp
> CVS: fp_Run.cpp fp_TextRun.cpp fv_FrameEdit.cpp fv_FrameEdit.h
> CVS: fv_View.cpp fv_View_cmd.cpp fv_View_protected.cpp
> CVS: fv_VisualDragText.cpp
> CVS:
> ----------------------------------------------------------------------
>
>
Received on Sat Dec 25 00:45:52 2004
This archive was generated by hypermail 2.1.8 : Sat Dec 25 2004 - 00:45:52 CET