diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:55:04 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:55:04 +0000 |
| commit | e2a6df6025e2fbecd24be7bd47b65f2f46736691 (patch) | |
| tree | 65c032dec3a43aa5ea6ca1c7638e7abdbb98510e /plugin | |
| parent | 745a01a809725264ee3fcc80d6194241c8c7bfeb (diff) | |
Merging XORG-CURRENT into trunkrel-0-6-1lg3d-rel-0-7-0lg3d-baseXORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGE
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/Main.c | 2 | ||||
| -rw-r--r-- | plugin/PProcess.c | 2 | ||||
| -rw-r--r-- | plugin/include/jri_md.h | 2 | ||||
| -rw-r--r-- | plugin/include/npapi.h | 2 | ||||
| -rw-r--r-- | plugin/libxrx.man | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/plugin/Main.c b/plugin/Main.c index 7aab439..7f11777 100644 --- a/plugin/Main.c +++ b/plugin/Main.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xrx/plugin/Main.c,v 1.9 2003/05/27 22:27:09 tsi Exp $ */ +/* $XFree86: xc/programs/xrx/plugin/Main.c,v 1.8tsi Exp $ */ /* * RX plug-in module based on the UnixTemplate file provided by Netcape. diff --git a/plugin/PProcess.c b/plugin/PProcess.c index fa75c1e..2de5b39 100644 --- a/plugin/PProcess.c +++ b/plugin/PProcess.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xrx/plugin/PProcess.c,v 1.7 2003/12/22 17:48:13 tsi Exp $ */ +/* $XFree86: xc/programs/xrx/plugin/PProcess.c,v 1.6tsi Exp $ */ #include "RxPlugin.h" #include "XUrls.h" diff --git a/plugin/include/jri_md.h b/plugin/include/jri_md.h index a7e5e03..e708b6d 100644 --- a/plugin/include/jri_md.h +++ b/plugin/include/jri_md.h @@ -4,7 +4,7 @@ * Java Runtime Interface - Machine Dependent Types * Copyright (c) 1996 Netscape Communications Corporation. All rights reserved. ******************************************************************************/ -/* $XFree86: xc/programs/xrx/plugin/include/jri_md.h,v 1.3 2001/01/17 23:46:25 dawes Exp $ */ +/* $XFree86: xc/programs/xrx/plugin/include/jri_md.h,v 1.2 1999/03/14 03:22:31 dawes Exp $ */ #ifndef JRI_MD_H #define JRI_MD_H diff --git a/plugin/include/npapi.h b/plugin/include/npapi.h index 888274f..a45b264 100644 --- a/plugin/include/npapi.h +++ b/plugin/include/npapi.h @@ -4,7 +4,7 @@ * npapi.h Revision: 1.76 * Netscape client plug-in API spec */ -/* $XFree86: xc/programs/xrx/plugin/include/npapi.h,v 1.5 2001/07/25 15:05:28 dawes Exp $ */ +/* $XFree86: xc/programs/xrx/plugin/include/npapi.h,v 1.4 2001/01/17 23:46:25 dawes Exp $ */ #ifndef _NPAPI_H_ #define _NPAPI_H_ diff --git a/plugin/libxrx.man b/plugin/libxrx.man index 703e7e9..60596ad 100644 --- a/plugin/libxrx.man +++ b/plugin/libxrx.man @@ -24,7 +24,7 @@ .\" from The Open Group. .\" .\" -.\" $XFree86: xc/programs/xrx/plugin/libxrx.man,v 1.8 2001/12/14 20:02:17 dawes Exp $ +.\" $XFree86: xc/programs/xrx/plugin/libxrx.man,v 1.7 2001/01/27 18:21:22 dawes Exp $ .\" .TH LIBXRX 1 __xorgversion__ .SH NAME @@ -50,7 +50,7 @@ embedded within the browser page from which it was launched. .SH INSTALLATION To install the \fBRX Plug-in\fP so that Netscape Navigator can use it, find the file named libxrx.so.6.3 or libxrx.sl.6.3 (or similar, depending on -your platform) in <ProjectRoot>/lib (e.g. /usr/X11R6.4/lib) and copy it to +your platform) in <ProjectRoot>/lib (e.g. /usr/X11R6/lib) and copy it to either /usr/local/lib/netscape/plugins or $HOME/.netscape/plugins. Do not install the symlinks libxrx.so or libxrx.sl; they would confuse Netscape. |