summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2006-03-08 13:14:23 +0000
committerRüdiger Timm <rt@openoffice.org>2006-03-08 13:14:23 +0000
commit2239ca41f42e3470fe8ba7b0467fc430b4404308 (patch)
tree377bb98f7d67f4c2663cd04f031859ea092dcc0c /jvmfwk
parent956e4988fec13356451d2fbdf16375e8d3d287eb (diff)
INTEGRATION: CWS pj50 (1.10.14); FILE MERGED
2006/02/20 18:21:21 pjanik 1.10.14.1: #i62324#: Fix typo (patch from Fridrich Strba).
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
index a776b2e4dda4..28f9b30d8759 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: otherjre.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: hr $ $Date: 2005-12-28 17:38:35 $
+ * last change: $Author: rt $ $Date: 2006-03-08 14:14:23 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -70,7 +70,7 @@ char const* const* OtherInfo::getRuntimePaths(int * size)
#ifdef WNT
"/bin/client/jvm.dll",
"/bin/hotspot/jvm.dll",
- "/bin/classic/jvm.dll"
+ "/bin/classic/jvm.dll",
"/bin/jrockit/jvm.dll"
#elif UNX
#ifdef MACOSX
@@ -80,7 +80,7 @@ char const* const* OtherInfo::getRuntimePaths(int * size)
"/jre/bin/classic/libjvm.so", // for IBM Java
"/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", // for Blackdown PPC
"/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", // for Blackdown AMD64
- "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so" // for Blackdown PPC
+ "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so", // for Blackdown PPC
"/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so" // for Java of BEA Systems
#endif
#endif