[ooo-build-commit] patches/dev300

[Kohei Yoshida]

 patches/dev300/apply |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 10ab5b65df714d02e3d141601260300bf4bea820
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Sep 30 17:42:30 2009 -0400

    Writer's field patches no longer apply against dev300-m60.
    
    * patches/dev300/apply: temporarily disabled the patches.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9874236..eab67e8 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2892,9 +2892,12 @@ sw-allow-negative-spacing.diff, n#364534, freuter
 # FIXME: 2009-08-13: Does not apply, huh? --tml
 # oox-fix-abs-relations.diff, n#493528, freuter
 
-field-patch.diff, n#248354, freuter
-field-patch-uno-fix.diff, cbosdo
+[ Fixes < dev300-m60 ]
+# FIXME: These patches no longer apply against dev300-m60.
+# field-patch.diff, n#248354, freuter
+# field-patch-uno-fix.diff, cbosdo
 
+[ Fixes ]
 sw-import-html-controls.diff, n#485609, freuter
 svx-hacky-htmlselect-control-import.diff, n#523191, noelpwer