diff options
author | Eric Bachard <ericb@openoffice.org> | 2007-10-22 15:42:17 +0000 |
---|---|---|
committer | Eric Bachard <ericb@openoffice.org> | 2007-10-22 15:42:17 +0000 |
commit | b4d3cef525a92b01ff11b98107d6ebfb4cbced6a (patch) | |
tree | 918ff7856031e20f38b20d6dd7acc59917b82a6d /jvmfwk/distributions | |
parent | 4b861245c16cdd100b82db86fdd9713d033558e9 (diff) |
#i82857# solve conflict with m234 ( sb71)
Diffstat (limited to 'jvmfwk/distributions')
-rw-r--r-- | jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml index 6b041c0bd451..1cf20d535c30 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml @@ -8,11 +8,13 @@ <vendorInfos> <vendor name="Apple Computer, Inc."> <minVersion>1.3.1</minVersion> - <maxVersion>1.5.0</maxVersion> </vendor> + <vendor name="Apple Inc."> + <minVersion>1.3.1</minVersion> + </vendor> </vendorInfos> - <plugins> + <library vendor="Apple Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library> <library vendor="Apple Computer, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library> </plugins> </javaSelection> |