diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-02-26 08:14:28 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-02-26 08:14:28 +0100 |
| commit | abd6cf1bdd661f126af2a721cb3f467f3a6db9f7 (patch) | |
| tree | aa109d560c5c340aa537c1e59b866be5acd62205 /doc/nx-X11_vs_XOrg69_patches/rrcrtc.c.NX.patch | |
| parent | 2eb85d140fdd582e6bf7086f0bbba08fa58c836c (diff) | |
| download | nx-libs-abd6cf1bdd661f126af2a721cb3f467f3a6db9f7.tar.gz nx-libs-abd6cf1bdd661f126af2a721cb3f467f3a6db9f7.tar.bz2 nx-libs-abd6cf1bdd661f126af2a721cb3f467f3a6db9f7.zip | |
rename original NX patches, so that we can see the patched file's name in the patch file name.
Diffstat (limited to 'doc/nx-X11_vs_XOrg69_patches/rrcrtc.c.NX.patch')
| -rw-r--r-- | doc/nx-X11_vs_XOrg69_patches/rrcrtc.c.NX.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/doc/nx-X11_vs_XOrg69_patches/rrcrtc.c.NX.patch b/doc/nx-X11_vs_XOrg69_patches/rrcrtc.c.NX.patch deleted file mode 100644 index 6cb8359b7..000000000 --- a/doc/nx-X11_vs_XOrg69_patches/rrcrtc.c.NX.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- ./nx-X11/programs/Xserver/randr/rrcrtc.c.X.original 2015-02-13 14:03:44.792440567 +0100 -+++ ./nx-X11/programs/Xserver/randr/rrcrtc.c 2015-02-10 19:13:13.624692625 +0100 -@@ -20,6 +20,23 @@ - * OF THIS SOFTWARE. - */ - -+/**************************************************************************/ -+/* */ -+/* Copyright (c) 2001, 2011 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 */ -+/* software is allowed according to terms specified in the file LICENSE */ -+/* which comes in the source distribution. */ -+/* */ -+/* Check http://www.nomachine.com/licensing.html for applicability. */ -+/* */ -+/* NX and NoMachine are trademarks of Medialogic S.p.A. */ -+/* */ -+/* All rights reserved. */ -+/* */ -+/**************************************************************************/ -+ - #include "randrstr.h" - #include "swaprep.h" - #include "registry.h" -@@ -836,6 +853,9 @@ - rep.status = RRSetConfigFailed; - goto sendReply; - } -+ #ifdef NXAGENT_SERVER /* Bug 21987 */ -+ pScrPriv->lastSetTime = time; -+ #endif - rep.status = RRSetConfigSuccess; - - sendReply: -@@ -846,7 +866,11 @@ - /* rep.status has already been filled in */ - rep.length = 0; - rep.sequenceNumber = client->sequence; -+ #ifndef NXAGENT_SERVER /* Bug 21987 */ - rep.newTimestamp = pScrPriv->lastConfigTime.milliseconds; -+ #else -+ rep.newTimestamp = pScrPriv->lastSetTime.milliseconds; -+ #endif - - if (client->swapped) - { |