diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-05-26 16:51:38 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-05-26 16:51:38 +0200 |
| commit | beb08f96c9b04beb11c1ce930fdb7363d6423977 (patch) | |
| tree | 95a106157305968bd5c594831139b599288b930d /nxcomp/Misc.cpp | |
| parent | e364fde72b064143a16d4f51ed34fa5e27f96004 (diff) | |
| parent | 1f44331574bdbe4069d13e4c26df18094b49e658 (diff) | |
| download | nx-libs-beb08f96c9b04beb11c1ce930fdb7363d6423977.tar.gz nx-libs-beb08f96c9b04beb11c1ce930fdb7363d6423977.tar.bz2 nx-libs-beb08f96c9b04beb11c1ce930fdb7363d6423977.zip | |
Merge branch 'sunweaver-pr/DXPC-re-license-retroactively' into arctica-3.6.x
Attributes GH PR #31: https://github.com/ArcticaProject/nx-libs/pull/31
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\ |