diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-05-21 12:25:13 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-05-26 06:33:01 +0200 |
| commit | a1d63569daaf604246e003dc217c14420aef2290 (patch) | |
| tree | df46c8c7a2ab7931cf1a0090fadca3f2ca42fd76 /nxcomp/Misc.cpp | |
| parent | 24903c921fcab7143d48ca9ba1f47cd8d6696fb5 (diff) | |
| download | nx-libs-a1d63569daaf604246e003dc217c14420aef2290.tar.gz nx-libs-a1d63569daaf604246e003dc217c14420aef2290.tar.bz2 nx-libs-a1d63569daaf604246e003dc217c14420aef2290.zip | |
Document retroactive re-licensing of the original DXPC code (closes #30).pr/DXPC-re-license-retroactively
* 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.cpp | 6 |
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\ |