diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-15 17:06:18 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-15 17:06:18 +0100 |
| commit | cb8bcbec88d3a1f181809df3bd1df887e92055dd (patch) | |
| tree | fb614e72bac07318cb68f0c097154dce70ea5342 /testscripts/run-nxproxy2nxproxy | |
| parent | 91d06723b0d3cb3e5358f6994f386f5c3c2229c0 (diff) | |
| parent | 00725f16a64b6e4c61c39d252d656b26dc80a9d2 (diff) | |
| download | nx-libs-cb8bcbec88d3a1f181809df3bd1df887e92055dd.tar.gz nx-libs-cb8bcbec88d3a1f181809df3bd1df887e92055dd.tar.bz2 nx-libs-cb8bcbec88d3a1f181809df3bd1df887e92055dd.zip | |
Merge branch 'sunweaver-pr/testscripts-file-headers' into 3.6.x
Attributes GH PR #283: https://github.com/ArcticaProject/nx-libs/pull/283
Diffstat (limited to 'testscripts/run-nxproxy2nxproxy')
| -rwxr-xr-x | testscripts/run-nxproxy2nxproxy | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/testscripts/run-nxproxy2nxproxy b/testscripts/run-nxproxy2nxproxy index 952fb3e96..305d921c2 100755 --- a/testscripts/run-nxproxy2nxproxy +++ b/testscripts/run-nxproxy2nxproxy @@ -8,16 +8,19 @@ set -e #/* Copyright (c) 2015-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/ #/* */ #/* NXSCRIPTS, 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. */ +#/* are copyright of the aforementioned persons and companies. */ #/* */ -#/* Check http://www.nomachine.com/licensing.html for applicability. */ -#/* */ -#/* NX and NoMachine are trademarks of Medialogic S.p.A. */ +#/* Redistribution and use of the present software is allowed according */ +#/* to terms specified in the file LICENSE.nxcomp which comes in the */ +#/* source distribution. */ #/* */ #/* All rights reserved. */ #/* */ +#/* NOTE: This software has received contributions from various other */ +#/* contributors, only the core maintainers and supporters are listed as */ +#/* copyright holders. Please contact us, if you feel you should be listed */ +#/* as copyright holder, as well. */ +#/* */ #/**************************************************************************/ # |