From 4f371d43226d7800a5011aa11c3afcec7f5a8ba2 Mon Sep 17 00:00:00 2001
From: Kurt Zenker <kz@openoffice.org>
Date: Fri, 11 Sep 2009 11:45:29 +0000
Subject: CWS-TOOLING: integrate CWS jl131 2009-09-02 16:42:40 +0200 jl 
 r275720 : #i97896# 2009-08-31 13:01:53 +0200 jl  r275599 : CWS-TOOLING:
 rebase CWS jl131 to trunk@275331 (milestone: DEV300:m56) 2009-07-31 14:35:30
 +0200 jl  r274531 : CWS-TOOLING: rebase CWS jl131 to trunk@274203 (milestone:
 DEV300:m53) 2009-07-23 14:20:32 +0200 jl  r274272 : #i79839# better error
 text when trying to modify shared layer without having write permission, eg.
 unopkg add --shared, unopkg remove --shared, unopkg reinstall --shared
 2009-07-22 16:38:02 +0200 jl  r274252 : #i97896# localize error message for
 lock file 2009-07-22 16:37:22 +0200 jl  r274251 : #i80462# unprecise wording
 in updatedialog 2009-07-22 16:36:06 +0200 jl  r274250 : #i97896# localize
 error message for lock file 2009-07-22 16:35:20 +0200 jl  r274249 : #i97896#
 localize error message for lock file 2009-07-22 15:07:30 +0200 jl  r274242 :
 #i98873# minimum java version is 1.5 since OOo 3.0

---
 jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'jvmfwk/distributions')

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
index 020c11b4973e..2dd5fe35f555 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
@@ -7,13 +7,13 @@
 
  <vendorInfos>
   <vendor name="Sun Microsystems Inc.">
-    <minVersion>1.3.1</minVersion>
+    <minVersion>1.5.0</minVersion>
   </vendor>
   <vendor name="The FreeBSD Foundation">
     <minVersion>1.6.0</minVersion>
   </vendor>
   <vendor name="Free Software Foundation, Inc.">
-    <minVersion>1.4.2</minVersion>
+    <minVersion>1.5.0</minVersion>
   </vendor>
  </vendorInfos>
 
-- 
cgit v1.2.3