[ooo-build-commit] patches/dev300

[Petr Mladek]

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

New commits:
commit bb5d0c303d5c57c177e3e72728c7d00bf96d0249
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Nov 10 12:36:58 2009 +0100

    svx-autoshape-cache-purge.diff already in ooo320-m4
    
    * patches/dev300/apply: disable svx-autoshape-cache-purge.diff for
      ooo320 >= m4

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4ea106d..723e3bd 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3210,12 +3210,14 @@ ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
 configmgr-validate-removedtree.diff, n#505704
 svx-fix-fit-to-frame-crash.diff, n#508621, rodo
 
-[ Fixes ]
-svx-fontwork-crash-fix.diff, n#526342, thorsten
-
+[ Fixes < dev300-m64 < ooo320-m4 ]
+# FIXME: integrated in ooo320-m4
 # purge autoshape geometry on model change
 svx-autoshape-cache-purge.diff, n#520104, thorsten
 
+[ Fixes ]
+svx-fontwork-crash-fix.diff, n#526342, thorsten
+
 # expand path placeholders early in template dialog
 normalize-template-paths-fix.diff, n#512146, thorsten