ATTN: Stop manually committing changes into STABLE please

From: J.M. Maurer <uwog_at_uwog.net>
Date: Sat Feb 23 2008 - 20:59:44 CET

All the commits below are a fscking _pain_ to backport, because people
*manually* commit different stuff into STABLE than what went into TRUNK.

Please STOP committing stuff into STABLE if you refuse to use
svnmerge.py.

Marc

------------------------------------------------------------------------
r22802 | msevior | 2008-02-06 02:54:59 +0100 (Wed, 06 Feb 2008) | 4
lines
Changed paths:
   M /abiword/trunk/src/text/ptbl/xp/pt_PT_Undo.cpp
   M /abiword/trunk/src/text/ptbl/xp/px_ChangeHistory.cpp
   M /abiword/trunk/src/text/ptbl/xp/px_ChangeHistory.h

Fixes for undo through GLOBS for abicollab

------------------------------------------------------------------------
r22803 | msevior | 2008-02-06 06:56:31 +0100 (Wed, 06 Feb 2008) | 6
lines
Changed paths:
   M /abiword/trunk/src/text/fmt/xp/fb_ColumnBreaker.cpp
   M /abiword/trunk/src/text/fmt/xp/fl_BlockLayout.cpp
   M /abiword/trunk/src/text/fmt/xp/fl_DocLayout.cpp
   M /abiword/trunk/src/text/fmt/xp/fl_DocLayout.h
   M /abiword/trunk/src/text/fmt/xp/fp_Column.cpp
   M /abiword/trunk/src/text/fmt/xp/fp_ContainerObject.cpp
   M /abiword/trunk/src/text/fmt/xp/fp_ContainerObject.h
   M /abiword/trunk/src/text/fmt/xp/fp_FrameContainer.cpp
   M /abiword/trunk/src/text/fmt/xp/fp_Line.cpp
   M /abiword/trunk/src/text/fmt/xp/fp_Page.cpp
   M /abiword/trunk/src/text/fmt/xp/fp_Page.h
   M /abiword/trunk/src/text/fmt/xp/fv_FrameEdit.cpp

Fix positioned object layout issues. Please backport to 2.6. This is
needed
for OLPC.

------------------------------------------------------------------------
r22804 | msevior | 2008-02-06 07:02:38 +0100 (Wed, 06 Feb 2008) | 4
lines
Changed paths:
   M /abiword/trunk/src/text/fmt/xp/fl_BlockLayout.cpp

One more fix for postioned objects. Please backport to 2.6.
Received on Sat Feb 23 21:00:03 2008

This archive was generated by hypermail 2.1.8 : Sat Feb 23 2008 - 21:00:03 CET