[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Tor Lillqvist]

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

New commits:
commit 42cdf83e4433504dd2c3b3a50ab8ff7539f89f76
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 14:44:16 2011 +0300

    Bypass min-password-length-sfx2.diff for now
    
    Doesn't apply and it isn't immediately obvious how to fix that. Also
    bypass the corresponding change to the help,
    min-password-length-helpcontent2.diff.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 319ace6..949582e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -297,8 +297,9 @@ svtools-default-new-document.diff, rodo
 svtools-unsort-template-dialogentries.diff, rodo
 
 # reduce mininum password length from 5 to 1.
-min-password-length-sfx2.diff, i#85453, kohei
-min-password-length-helpcontent2.diff, i#112772, timar
+# FIXME 2011-04-04: Doesn't apply any more
+# min-password-length-sfx2.diff, i#85453, kohei
+# min-password-length-helpcontent2.diff, i#112772, timar
 
 # allow users to change current document password.
 document-password-change-sfx2.diff, kohei