aboutsummaryrefslogtreecommitdiff
path: root/nxcomp/Misc.cpp
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-05-21 12:25:13 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-05-26 09:15:15 +0200
commit1f44331574bdbe4069d13e4c26df18094b49e658 (patch)
tree2359b0d56953db7bdae0d005ce49ab771a81b2e7 /nxcomp/Misc.cpp
parent230852e0e77985e1d62593fe393059dc0053c043 (diff)
downloadnx-libs-1f44331574bdbe4069d13e4c26df18094b49e658.tar.gz
nx-libs-1f44331574bdbe4069d13e4c26df18094b49e658.tar.bz2
nx-libs-1f44331574bdbe4069d13e4c26df18094b49e658.zip
Document retroactive re-licensing of the original DXPC code (closes #30).
* Update nxcomp/LICENSE. * Add nxcomp/README.on-retroactive-DXPC-license, giving a short overview of the flow of discussions * Add "modified or unmodified" to the license information printed out to stdout in nxcomp/Misc.cpp * Fix copyright year (2006->2003) for Gian Filippo Pinzari (and move him to the GPL-2 section). * Add the complete .mbox file of Debian bug #748565.
Diffstat (limited to 'nxcomp/Misc.cpp')
-rw-r--r--nxcomp/Misc.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/nxcomp/Misc.cpp b/nxcomp/Misc.cpp
index 0095eaa74..5d53524cf 100644
--- a/nxcomp/Misc.cpp
+++ b/nxcomp/Misc.cpp
@@ -384,9 +384,9 @@ static const char CopyrightInfo[] =
Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.\n\
\n\
NXCOMP, NX protocol compression and NX extensions to this software \n\
-are copyright of NoMachine. Redistribution and use of the present\n\
-software is allowed according to terms specified in the file LICENSE\n\
-which comes in the source distribution.\n\
+are copyright of NoMachine. Redistribution (modified or unmodified) and
+use of the present\n\ software is allowed according to terms specified in
+the file LICENSE\n\ which comes in the source distribution.\n\
\n\
Check http://www.nomachine.com/licensing.html for applicability.\n\
\n\