diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-06 01:14:56 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-06 01:14:56 +0200 |
| commit | 9b50e008890a72c76ac8da1524c06f048c9b9fd8 (patch) | |
| tree | 1a1ba45051803188ec3922d7a67a92c6c058a40b /nxcomp/Makefile.in | |
| parent | 5cbc93678753a9933b646fbb96ccf8797fef1b93 (diff) | |
| parent | 6144b615dd7ae2acd786aaa08f66c9743870b709 (diff) | |
| download | nx-libs-9b50e008890a72c76ac8da1524c06f048c9b9fd8.tar.gz nx-libs-9b50e008890a72c76ac8da1524c06f048c9b9fd8.tar.bz2 nx-libs-9b50e008890a72c76ac8da1524c06f048c9b9fd8.zip | |
Merge branch 'sunweaver-pr/update-license-files' into 3.6.x
Attributes GH PR #182: https://github.com/ArcticaProject/nx-libs/pull/182
Reviewed by: Nicolas Arenas <narenas@qindel.com> -- Tue, 05 Jul 2016 06:15:57 -0700
Reviewed by: Mihai Moldovan <ionic@ionic.de> -- Tue, 05 Jul 2016 09:40:04 -0700
Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Tue, 05 Jul 2016 13:57:05 -0700
:44:48 -0700
Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Tue, 05 Jul 2016 13:57:05 -0700
Diffstat (limited to 'nxcomp/Makefile.in')
| -rw-r--r-- | nxcomp/Makefile.in | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in index ee12c3dbb..f18875524 100644 --- a/nxcomp/Makefile.in +++ b/nxcomp/Makefile.in @@ -1,19 +1,27 @@ -############################################################################ -# # -# Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. # -# # -# NXCOMP, 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. # -# # -# Check http://www.nomachine.com/licensing.html for applicability. # -# # -# NX and NoMachine are trademarks of Medialogic S.p.A. # -# # -# All rights reserved. # -# # -############################################################################ +#/**************************************************************************/ +#/* */ +#/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com) */ +#/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */ +#/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de> */ +#/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de> */ +#/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/ +#/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) */ +#/* */ +#/* NXCOMP, NX protocol compression and NX extensions to this software */ +#/* are copyright of the aforementioned persons and companies. */ +#/* */ +#/* 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. */ +#/* */ +#/**************************************************************************/ # # Get these values from the configure script. The |