aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nx-X11/CHANGELOG8
-rw-r--r--nx-X11/CHANGELOG.NX.original8
-rw-r--r--nx-X11/LICENSE2
-rw-r--r--nx-X11/config/cf/host.def2
-rw-r--r--nx-X11/config/cf/host.def.NX.original2
-rw-r--r--nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h2
-rw-r--r--nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h.NX.original2
-rw-r--r--nx-X11/include/Xpoll.h.in2
-rw-r--r--nx-X11/include/Xpoll.h.in.NX.original2
-rw-r--r--nx-X11/lib/X11/ConnDis.c2
-rw-r--r--nx-X11/lib/X11/ConnDis.c.NX.original2
-rw-r--r--nx-X11/lib/X11/Imakefile2
-rw-r--r--nx-X11/lib/X11/Imakefile.NX.original2
-rw-r--r--nx-X11/lib/X11/OpenDis.c2
-rw-r--r--nx-X11/lib/X11/OpenDis.c.NX.original2
-rw-r--r--nx-X11/lib/X11/XlibAsync.c2
-rw-r--r--nx-X11/lib/X11/XlibAsync.c.NX.original2
-rw-r--r--nx-X11/lib/X11/XlibInt.c2
-rw-r--r--nx-X11/lib/X11/XlibInt.c.NX.original2
-rw-r--r--nx-X11/lib/X11/Xlibint.h2
-rw-r--r--nx-X11/lib/X11/Xlibint.h.NX.original2
-rw-r--r--nx-X11/lib/Xt/Imakefile2
-rw-r--r--nx-X11/lib/Xt/Imakefile.NX.original2
-rw-r--r--nx-X11/lib/Xt/NextEvent.c2
-rw-r--r--nx-X11/lib/Xt/NextEvent.c.NX.original2
-rw-r--r--nx-X11/lib/xtrans/Xtranssock.c2
-rw-r--r--nx-X11/lib/xtrans/Xtranssock.c.NX.original2
-rw-r--r--nx-X11/programs/Imakefile2
-rw-r--r--nx-X11/programs/Imakefile.NX.original2
-rw-r--r--nx-X11/programs/Xserver/Imakefile2
-rw-r--r--nx-X11/programs/Xserver/Imakefile.NX.original2
-rw-r--r--nx-X11/programs/Xserver/Xext/Imakefile2
-rw-r--r--nx-X11/programs/Xserver/Xext/Imakefile.NX.original2
-rw-r--r--nx-X11/programs/Xserver/Xext/security.c2
-rw-r--r--nx-X11/programs/Xserver/Xext/security.c.NX.original2
-rw-r--r--nx-X11/programs/Xserver/mi/Imakefile2
-rw-r--r--nx-X11/programs/Xserver/mi/Imakefile.NX.original2
-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
-rw-r--r--nx-X11/programs/xterm/Imakefile2
-rw-r--r--nx-X11/programs/xterm/Imakefile.NX.original2
-rw-r--r--nx-X11/programs/xterm/charproc.c2
-rw-r--r--nx-X11/programs/xterm/charproc.c.NX.original2
-rw-r--r--nx-X11/programs/xterm/main.c2
-rw-r--r--nx-X11/programs/xterm/main.c.NX.original2
55 files changed, 69 insertions, 53 deletions
diff --git a/nx-X11/CHANGELOG b/nx-X11/CHANGELOG
index 21201acc6..e433f2ca0 100644
--- a/nx-X11/CHANGELOG
+++ b/nx-X11/CHANGELOG
@@ -1,5 +1,13 @@
ChangeLog:
+nx-X11-3.4.0-3
+
+- Updated copyright to year 2010.
+
+nx-X11-3.4.0-2
+
+- Fixed TR04G02208. Added a path to rgb file.
+
nx-X11-3.4.0-1
- Opened the 3.4.0 branch based on nx-X11-3.3.0-7.
diff --git a/nx-X11/CHANGELOG.NX.original b/nx-X11/CHANGELOG.NX.original
index 21201acc6..e433f2ca0 100644
--- a/nx-X11/CHANGELOG.NX.original
+++ b/nx-X11/CHANGELOG.NX.original
@@ -1,5 +1,13 @@
ChangeLog:
+nx-X11-3.4.0-3
+
+- Updated copyright to year 2010.
+
+nx-X11-3.4.0-2
+
+- Fixed TR04G02208. Added a path to rgb file.
+
nx-X11-3.4.0-1
- Opened the 3.4.0 branch based on nx-X11-3.3.0-7.
diff --git a/nx-X11/LICENSE b/nx-X11/LICENSE
index 02a2f50fc..e394a657c 100644
--- a/nx-X11/LICENSE
+++ b/nx-X11/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2001, 2009 NoMachine - http://www.nomachine.com/.
+Copyright (c) 2001, 2010 NoMachine - http://www.nomachine.com/.
NX-X11 and NX extensions to X are copyright of NoMachine.
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def
index cde1e03d8..607e4f084 100644
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -31,7 +31,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
/**************************************************************************/
/* */
-/* 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/config/cf/host.def.NX.original b/nx-X11/config/cf/host.def.NX.original
index cde1e03d8..607e4f084 100644
--- a/nx-X11/config/cf/host.def.NX.original
+++ b/nx-X11/config/cf/host.def.NX.original
@@ -31,7 +31,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
/**************************************************************************/
/* */
-/* 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/extras/Mesa/src/mesa/main/WSDrawBuffer.h b/nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h
index 8e2bd12fc..39910ea55 100644
--- a/nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h
+++ b/nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXAGENT, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h.NX.original b/nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h.NX.original
index 8e2bd12fc..39910ea55 100644
--- a/nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h.NX.original
+++ b/nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h.NX.original
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXAGENT, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
diff --git a/nx-X11/include/Xpoll.h.in b/nx-X11/include/Xpoll.h.in
index bc7066b12..b44b9264e 100644
--- a/nx-X11/include/Xpoll.h.in
+++ b/nx-X11/include/Xpoll.h.in
@@ -53,7 +53,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/include/Xpoll.h.in.NX.original b/nx-X11/include/Xpoll.h.in.NX.original
index bc7066b12..b44b9264e 100644
--- a/nx-X11/include/Xpoll.h.in.NX.original
+++ b/nx-X11/include/Xpoll.h.in.NX.original
@@ -53,7 +53,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/lib/X11/ConnDis.c b/nx-X11/lib/X11/ConnDis.c
index 7ea18669f..5dba9cc87 100644
--- a/nx-X11/lib/X11/ConnDis.c
+++ b/nx-X11/lib/X11/ConnDis.c
@@ -28,7 +28,7 @@ in this Software without prior written authorization 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/lib/X11/ConnDis.c.NX.original b/nx-X11/lib/X11/ConnDis.c.NX.original
index 7ea18669f..5dba9cc87 100644
--- a/nx-X11/lib/X11/ConnDis.c.NX.original
+++ b/nx-X11/lib/X11/ConnDis.c.NX.original
@@ -28,7 +28,7 @@ in this Software without prior written authorization 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/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile
index 9c03508f3..3aca4dfed 100644
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* 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/lib/X11/Imakefile.NX.original b/nx-X11/lib/X11/Imakefile.NX.original
index 9c03508f3..3aca4dfed 100644
--- a/nx-X11/lib/X11/Imakefile.NX.original
+++ b/nx-X11/lib/X11/Imakefile.NX.original
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* 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/lib/X11/OpenDis.c b/nx-X11/lib/X11/OpenDis.c
index 950804a30..c0e44dabb 100644
--- a/nx-X11/lib/X11/OpenDis.c
+++ b/nx-X11/lib/X11/OpenDis.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization 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/lib/X11/OpenDis.c.NX.original b/nx-X11/lib/X11/OpenDis.c.NX.original
index 950804a30..c0e44dabb 100644
--- a/nx-X11/lib/X11/OpenDis.c.NX.original
+++ b/nx-X11/lib/X11/OpenDis.c.NX.original
@@ -27,7 +27,7 @@ in this Software without prior written authorization 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/lib/X11/XlibAsync.c b/nx-X11/lib/X11/XlibAsync.c
index c390bfd91..4764f13bd 100644
--- a/nx-X11/lib/X11/XlibAsync.c
+++ b/nx-X11/lib/X11/XlibAsync.c
@@ -29,7 +29,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/lib/X11/XlibAsync.c.NX.original b/nx-X11/lib/X11/XlibAsync.c.NX.original
index c390bfd91..4764f13bd 100644
--- a/nx-X11/lib/X11/XlibAsync.c.NX.original
+++ b/nx-X11/lib/X11/XlibAsync.c.NX.original
@@ -29,7 +29,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/lib/X11/XlibInt.c b/nx-X11/lib/X11/XlibInt.c
index 1c9a35e88..8ea4d325e 100644
--- a/nx-X11/lib/X11/XlibInt.c
+++ b/nx-X11/lib/X11/XlibInt.c
@@ -29,7 +29,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/lib/X11/XlibInt.c.NX.original b/nx-X11/lib/X11/XlibInt.c.NX.original
index 1c9a35e88..8ea4d325e 100644
--- a/nx-X11/lib/X11/XlibInt.c.NX.original
+++ b/nx-X11/lib/X11/XlibInt.c.NX.original
@@ -29,7 +29,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/lib/X11/Xlibint.h b/nx-X11/lib/X11/Xlibint.h
index 68badda8a..96ee095af 100644
--- a/nx-X11/lib/X11/Xlibint.h
+++ b/nx-X11/lib/X11/Xlibint.h
@@ -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/lib/X11/Xlibint.h.NX.original b/nx-X11/lib/X11/Xlibint.h.NX.original
index 68badda8a..96ee095af 100644
--- a/nx-X11/lib/X11/Xlibint.h.NX.original
+++ b/nx-X11/lib/X11/Xlibint.h.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/lib/Xt/Imakefile b/nx-X11/lib/Xt/Imakefile
index b4fd51653..a48081cbb 100644
--- a/nx-X11/lib/Xt/Imakefile
+++ b/nx-X11/lib/Xt/Imakefile
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* 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/lib/Xt/Imakefile.NX.original b/nx-X11/lib/Xt/Imakefile.NX.original
index b4fd51653..a48081cbb 100644
--- a/nx-X11/lib/Xt/Imakefile.NX.original
+++ b/nx-X11/lib/Xt/Imakefile.NX.original
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* 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/lib/Xt/NextEvent.c b/nx-X11/lib/Xt/NextEvent.c
index 047c3967e..af636512e 100644
--- a/nx-X11/lib/Xt/NextEvent.c
+++ b/nx-X11/lib/Xt/NextEvent.c
@@ -61,7 +61,7 @@ in this Software without prior written authorization 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/lib/Xt/NextEvent.c.NX.original b/nx-X11/lib/Xt/NextEvent.c.NX.original
index 047c3967e..af636512e 100644
--- a/nx-X11/lib/Xt/NextEvent.c.NX.original
+++ b/nx-X11/lib/Xt/NextEvent.c.NX.original
@@ -61,7 +61,7 @@ in this Software without prior written authorization 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/lib/xtrans/Xtranssock.c b/nx-X11/lib/xtrans/Xtranssock.c
index aaff074f1..b1e5a4709 100644
--- a/nx-X11/lib/xtrans/Xtranssock.c
+++ b/nx-X11/lib/xtrans/Xtranssock.c
@@ -55,7 +55,7 @@ from the copyright holders.
/**************************************************************************/
/* */
-/* 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/lib/xtrans/Xtranssock.c.NX.original b/nx-X11/lib/xtrans/Xtranssock.c.NX.original
index aaff074f1..b1e5a4709 100644
--- a/nx-X11/lib/xtrans/Xtranssock.c.NX.original
+++ b/nx-X11/lib/xtrans/Xtranssock.c.NX.original
@@ -55,7 +55,7 @@ from the copyright holders.
/**************************************************************************/
/* */
-/* 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/Imakefile b/nx-X11/programs/Imakefile
index 3d36f4c75..dad15fa29 100644
--- a/nx-X11/programs/Imakefile
+++ b/nx-X11/programs/Imakefile
@@ -5,7 +5,7 @@ XCOMM $Xorg: Imakefile,v 1.4 2000/08/17 19:47:01 cpqbld Exp $
XCOMM $XFree86: xc/programs/Imakefile,v 3.54 2003/04/14 20:37:16 herrb Exp $
/**************************************************************************/
/* */
-/* 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/Imakefile.NX.original b/nx-X11/programs/Imakefile.NX.original
index 3d36f4c75..dad15fa29 100644
--- a/nx-X11/programs/Imakefile.NX.original
+++ b/nx-X11/programs/Imakefile.NX.original
@@ -5,7 +5,7 @@ XCOMM $Xorg: Imakefile,v 1.4 2000/08/17 19:47:01 cpqbld Exp $
XCOMM $XFree86: xc/programs/Imakefile,v 3.54 2003/04/14 20:37:16 herrb Exp $
/**************************************************************************/
/* */
-/* 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/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 3bde627ca..8a29e662e 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -2,7 +2,7 @@ XCOMM $XdotOrg: xc/programs/Xserver/Imakefile,v 1.37 2005/11/18 18:15:23 ajax Ex
XCOMM $Xorg: Imakefile,v 1.4 2001/03/14 18:42:02 pookie Exp $
/**************************************************************************/
/* */
-/* 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/Imakefile.NX.original b/nx-X11/programs/Xserver/Imakefile.NX.original
index 3bde627ca..8a29e662e 100644
--- a/nx-X11/programs/Xserver/Imakefile.NX.original
+++ b/nx-X11/programs/Xserver/Imakefile.NX.original
@@ -2,7 +2,7 @@ XCOMM $XdotOrg: xc/programs/Xserver/Imakefile,v 1.37 2005/11/18 18:15:23 ajax Ex
XCOMM $Xorg: Imakefile,v 1.4 2001/03/14 18:42:02 pookie Exp $
/**************************************************************************/
/* */
-/* 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/Xext/Imakefile b/nx-X11/programs/Xserver/Xext/Imakefile
index 7c4befd43..697c8dd52 100644
--- a/nx-X11/programs/Xserver/Xext/Imakefile
+++ b/nx-X11/programs/Xserver/Xext/Imakefile
@@ -8,7 +8,7 @@ XCOMM $XFree86: xc/programs/Xserver/Xext/Imakefile,v 3.43 2003/04/21 18:56:48 sv
/**************************************************************************/
/* */
-/* 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/Xext/Imakefile.NX.original b/nx-X11/programs/Xserver/Xext/Imakefile.NX.original
index 7c4befd43..697c8dd52 100644
--- a/nx-X11/programs/Xserver/Xext/Imakefile.NX.original
+++ b/nx-X11/programs/Xserver/Xext/Imakefile.NX.original
@@ -8,7 +8,7 @@ XCOMM $XFree86: xc/programs/Xserver/Xext/Imakefile,v 3.43 2003/04/21 18:56:48 sv
/**************************************************************************/
/* */
-/* 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/Xext/security.c b/nx-X11/programs/Xserver/Xext/security.c
index 82fee6b0c..d271e1bc8 100644
--- a/nx-X11/programs/Xserver/Xext/security.c
+++ b/nx-X11/programs/Xserver/Xext/security.c
@@ -29,7 +29,7 @@ in this Software without prior written authorization 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/Xext/security.c.NX.original b/nx-X11/programs/Xserver/Xext/security.c.NX.original
index 82fee6b0c..d271e1bc8 100644
--- a/nx-X11/programs/Xserver/Xext/security.c.NX.original
+++ b/nx-X11/programs/Xserver/Xext/security.c.NX.original
@@ -29,7 +29,7 @@ in this Software without prior written authorization 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/mi/Imakefile b/nx-X11/programs/Xserver/mi/Imakefile
index 46727ad28..322ad09e7 100644
--- a/nx-X11/programs/Xserver/mi/Imakefile
+++ b/nx-X11/programs/Xserver/mi/Imakefile
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* 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/mi/Imakefile.NX.original b/nx-X11/programs/Xserver/mi/Imakefile.NX.original
index 46727ad28..322ad09e7 100644
--- a/nx-X11/programs/Xserver/mi/Imakefile.NX.original
+++ b/nx-X11/programs/Xserver/mi/Imakefile.NX.original
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* 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 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 */
diff --git a/nx-X11/programs/xterm/Imakefile b/nx-X11/programs/xterm/Imakefile
index 2c2181b65..349190ddf 100644
--- a/nx-X11/programs/xterm/Imakefile
+++ b/nx-X11/programs/xterm/Imakefile
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* 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/xterm/Imakefile.NX.original b/nx-X11/programs/xterm/Imakefile.NX.original
index 2c2181b65..349190ddf 100644
--- a/nx-X11/programs/xterm/Imakefile.NX.original
+++ b/nx-X11/programs/xterm/Imakefile.NX.original
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* 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/xterm/charproc.c b/nx-X11/programs/xterm/charproc.c
index 00bd6252c..f8f53d579 100644
--- a/nx-X11/programs/xterm/charproc.c
+++ b/nx-X11/programs/xterm/charproc.c
@@ -84,7 +84,7 @@ in this Software without prior written authorization 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/xterm/charproc.c.NX.original b/nx-X11/programs/xterm/charproc.c.NX.original
index 00bd6252c..f8f53d579 100644
--- a/nx-X11/programs/xterm/charproc.c.NX.original
+++ b/nx-X11/programs/xterm/charproc.c.NX.original
@@ -84,7 +84,7 @@ in this Software without prior written authorization 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/xterm/main.c b/nx-X11/programs/xterm/main.c
index 5582ad858..b1393d048 100644
--- a/nx-X11/programs/xterm/main.c
+++ b/nx-X11/programs/xterm/main.c
@@ -93,7 +93,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/xterm/main.c.NX.original b/nx-X11/programs/xterm/main.c.NX.original
index 5582ad858..b1393d048 100644
--- a/nx-X11/programs/xterm/main.c.NX.original
+++ b/nx-X11/programs/xterm/main.c.NX.original
@@ -93,7 +93,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 */