diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-07-11 19:49:09 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-07-13 21:38:47 +0100 |
| commit | 2c47c9989e308ddef22066607795eb3feef9f76b (patch) | |
| tree | 35a3526c8133d25a502e5cbd01effe180e6b6339 /jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml | |
| parent | 424d0fedd55699910830a5a342d54b8516b7b5c7 (diff) | |
re-base on ALv2 code. Includes:
cws mba34issues01: #i117709#: make sure that parent of error message box is visible
Patch contributed by Mathias Bauer
http://svn.apache.org/viewvc?view=revision&revision=1172346
i#119036 - improve user experience of certification dialog - only shown once
Patch contributed by Oliver-Rainer Wittmann
http://svn.apache.org/viewvc?view=revision&revision=1299727
Diffstat (limited to 'jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml')
| -rw-r--r-- | jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml index 4cb6c8b7e991..2453492ff535 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml @@ -1,11 +1,31 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <updated>2008-08-27</updated> + <updated>2012-07-12</updated> <vendorInfos> + <vendor name="Oracle Corporation"> + <minVersion>1.7.0</minVersion> + </vendor> <vendor name="Sun Microsystems Inc."> <minVersion>1.5.0</minVersion> </vendor> @@ -18,6 +38,7 @@ </vendorInfos> <plugins> + <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> <library vendor="The FreeBSD Foundation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> |