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 /nx-X11/Imakefile | |
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 'nx-X11/Imakefile')
-rw-r--r-- | nx-X11/Imakefile | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/nx-X11/Imakefile b/nx-X11/Imakefile index 45948d2af..78b4cb3f1 100644 --- a/nx-X11/Imakefile +++ b/nx-X11/Imakefile @@ -1,9 +1,22 @@ -XCOMM $Xorg: Imakefile,v 1.5 2000/08/17 19:41:44 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/Imakefile,v 3.29tsi Exp $ +/**************************************************************************/ +/* */ +/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com) */ +/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */ +/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/ +/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de> */ +/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de> */ +/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) */ +/* */ +/* nx-X11, 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 which comes in the source */ +/* distribution. */ +/* */ +/* All rights reserved. */ +/* */ +/**************************************************************************/ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" |