aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/os
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2011-10-10 17:47:47 +0200
committerReinhard Tartler <siretart@tauware.de>2011-10-10 17:47:47 +0200
commit4fceb197efd5938926ac88b5d730ecec7953623f (patch)
tree5db66a4011e95747580a54cb56150df566220feb /nx-X11/programs/Xserver/os
parent3daf6d44677355d71df527a0d6fc4c4494628731 (diff)
downloadnx-libs-4fceb197efd5938926ac88b5d730ecec7953623f.tar.gz
nx-libs-4fceb197efd5938926ac88b5d730ecec7953623f.tar.bz2
nx-libs-4fceb197efd5938926ac88b5d730ecec7953623f.zip
Imported nx-X11-3.4.0-3.tar.gznx-X11/3.4.0-3
Summary: Imported nx-X11-3.4.0-3.tar.gz Keywords: Imported nx-X11-3.4.0-3.tar.gz into Git repository
Diffstat (limited to 'nx-X11/programs/Xserver/os')
-rw-r--r--nx-X11/programs/Xserver/os/Imakefile2
-rw-r--r--nx-X11/programs/Xserver/os/Imakefile.NX.original2
-rw-r--r--nx-X11/programs/Xserver/os/WaitFor.c2
-rw-r--r--nx-X11/programs/Xserver/os/WaitFor.c.NX.original2
-rw-r--r--nx-X11/programs/Xserver/os/auth.c2
-rw-r--r--nx-X11/programs/Xserver/os/auth.c.NX.original2
-rw-r--r--nx-X11/programs/Xserver/os/log.c2
-rw-r--r--nx-X11/programs/Xserver/os/log.c.NX.original2
-rw-r--r--nx-X11/programs/Xserver/os/oscolor.c2
-rw-r--r--nx-X11/programs/Xserver/os/oscolor.c.NX.original2
-rw-r--r--nx-X11/programs/Xserver/os/utils.c2
-rw-r--r--nx-X11/programs/Xserver/os/utils.c.NX.original2
12 files changed, 12 insertions, 12 deletions
diff --git a/nx-X11/programs/Xserver/os/Imakefile b/nx-X11/programs/Xserver/os/Imakefile
index a1e833c07..3acf6637e 100644
--- a/nx-X11/programs/Xserver/os/Imakefile
+++ b/nx-X11/programs/Xserver/os/Imakefile
@@ -7,7 +7,7 @@ XCOMM $XFree86: xc/programs/Xserver/os/Imakefile,v 3.40 2003/09/09 03:20:41 dawe
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NX-X11, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nx-X11/programs/Xserver/os/Imakefile.NX.original b/nx-X11/programs/Xserver/os/Imakefile.NX.original
index a1e833c07..3acf6637e 100644
--- a/nx-X11/programs/Xserver/os/Imakefile.NX.original
+++ b/nx-X11/programs/Xserver/os/Imakefile.NX.original
@@ -7,7 +7,7 @@ XCOMM $XFree86: xc/programs/Xserver/os/Imakefile,v 3.40 2003/09/09 03:20:41 dawe
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NX-X11, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nx-X11/programs/Xserver/os/WaitFor.c b/nx-X11/programs/Xserver/os/WaitFor.c
index d35a9eeda..31b8f125b 100644
--- a/nx-X11/programs/Xserver/os/WaitFor.c
+++ b/nx-X11/programs/Xserver/os/WaitFor.c
@@ -50,7 +50,7 @@ SOFTWARE.
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NX-X11, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nx-X11/programs/Xserver/os/WaitFor.c.NX.original b/nx-X11/programs/Xserver/os/WaitFor.c.NX.original
index d35a9eeda..31b8f125b 100644
--- a/nx-X11/programs/Xserver/os/WaitFor.c.NX.original
+++ b/nx-X11/programs/Xserver/os/WaitFor.c.NX.original
@@ -50,7 +50,7 @@ SOFTWARE.
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NX-X11, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nx-X11/programs/Xserver/os/auth.c b/nx-X11/programs/Xserver/os/auth.c
index 950e86d9b..711f40beb 100644
--- a/nx-X11/programs/Xserver/os/auth.c
+++ b/nx-X11/programs/Xserver/os/auth.c
@@ -30,7 +30,7 @@ from The Open Group.
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NX-X11, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nx-X11/programs/Xserver/os/auth.c.NX.original b/nx-X11/programs/Xserver/os/auth.c.NX.original
index 950e86d9b..711f40beb 100644
--- a/nx-X11/programs/Xserver/os/auth.c.NX.original
+++ b/nx-X11/programs/Xserver/os/auth.c.NX.original
@@ -30,7 +30,7 @@ from The Open Group.
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NX-X11, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nx-X11/programs/Xserver/os/log.c b/nx-X11/programs/Xserver/os/log.c
index eeb24d19a..d3aef0362 100644
--- a/nx-X11/programs/Xserver/os/log.c
+++ b/nx-X11/programs/Xserver/os/log.c
@@ -80,7 +80,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NX-X11, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nx-X11/programs/Xserver/os/log.c.NX.original b/nx-X11/programs/Xserver/os/log.c.NX.original
index eeb24d19a..d3aef0362 100644
--- a/nx-X11/programs/Xserver/os/log.c.NX.original
+++ b/nx-X11/programs/Xserver/os/log.c.NX.original
@@ -80,7 +80,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NX-X11, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nx-X11/programs/Xserver/os/oscolor.c b/nx-X11/programs/Xserver/os/oscolor.c
index ecb76ccd6..cf79857f4 100644
--- a/nx-X11/programs/Xserver/os/oscolor.c
+++ b/nx-X11/programs/Xserver/os/oscolor.c
@@ -53,7 +53,7 @@ SOFTWARE.
#include <sys/stat.h>
#include <unistd.h>
-static char* nxAltRgbPaths[] = {"/usr/share/X11/rgb", "/etc/X11/rgb"};
+static char* nxAltRgbPaths[] = {"/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"};
static char _NXRgbPath[1024];
#endif
diff --git a/nx-X11/programs/Xserver/os/oscolor.c.NX.original b/nx-X11/programs/Xserver/os/oscolor.c.NX.original
index ecb76ccd6..cf79857f4 100644
--- a/nx-X11/programs/Xserver/os/oscolor.c.NX.original
+++ b/nx-X11/programs/Xserver/os/oscolor.c.NX.original
@@ -53,7 +53,7 @@ SOFTWARE.
#include <sys/stat.h>
#include <unistd.h>
-static char* nxAltRgbPaths[] = {"/usr/share/X11/rgb", "/etc/X11/rgb"};
+static char* nxAltRgbPaths[] = {"/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"};
static char _NXRgbPath[1024];
#endif
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c
index a8a943a55..5821dd699 100644
--- a/nx-X11/programs/Xserver/os/utils.c
+++ b/nx-X11/programs/Xserver/os/utils.c
@@ -54,7 +54,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NX-X11, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nx-X11/programs/Xserver/os/utils.c.NX.original b/nx-X11/programs/Xserver/os/utils.c.NX.original
index a8a943a55..5821dd699 100644
--- a/nx-X11/programs/Xserver/os/utils.c.NX.original
+++ b/nx-X11/programs/Xserver/os/utils.c.NX.original
@@ -54,7 +54,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NX-X11, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 15:23:04 +0000