aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-08-24 16:13:52 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-08-24 16:16:50 +0200
commite2011608fc9f6142e1d84292655fca62f7f57363 (patch)
tree209171c082a39566ae6971af842c627ce0d3c271
parent8fc2e80bcdc121b37a379e0bfff8595cb46fd0b6 (diff)
downloadnx-libs-e2011608fc9f6142e1d84292655fca62f7f57363.tar.gz
nx-libs-e2011608fc9f6142e1d84292655fca62f7f57363.tar.bz2
nx-libs-e2011608fc9f6142e1d84292655fca62f7f57363.zip
nxcomp/Misc.cpp: Display new list of copyright holders when launching nxproxy / nxagent.
-rw-r--r--nxcomp/Misc.cpp24
1 files changed, 16 insertions, 8 deletions
diff --git a/nxcomp/Misc.cpp b/nxcomp/Misc.cpp
index c94dc8b9c..b1f024601 100644
--- a/nxcomp/Misc.cpp
+++ b/nxcomp/Misc.cpp
@@ -393,18 +393,26 @@ const char *GetUsageInfo()
static const char CopyrightInfo[] =
"\
-Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.\n\
+Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)\n\
+Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>\n\
+Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>\n\
+Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>\n\
+Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n\
+Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)\n\
\n\
-NXCOMP, NX protocol compression and NX extensions to this software \n\
-are copyright of NoMachine. Redistribution (modified or unmodified) and\n\
-use of the present software is allowed according to terms specified in\n\
-the file LICENSE which comes in the source distribution.\n\
+NXCOMP, NX protocol compression and NX extensions to this software\n\
+are copyright of the aforementioned persons and companies.\n\
\n\
-Check http://www.nomachine.com/licensing.html for applicability.\n\
-\n\
-NX and NoMachine are trademarks of NoMachine S.r.l.\n\
+Redistribution and use of the present software is allowed according\n\
+to terms specified in the file LICENSE.nxcomp which comes in the\n\
+source distribution.\n\
\n\
All rights reserved.\n\
+\n\
+NOTE: This software has received contributions from various other\n\
+contributors, only the core maintainers and supporters are listed as\n\
+copyright holders. Please contact us, if you feel you should be listed\n\
+as copyright holder, as well.\n\
";
const char *GetCopyrightInfo()