aboutsummaryrefslogtreecommitdiff
path: root/nxcomp/Proxy.h
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-05 16:22:51 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-06 01:07:24 +0200
commit51c3d42f3d15b181d58a0df1e5abac8d298d4484 (patch)
tree141ee9b812fd5369c18369b2bb73bd2cc2b18167 /nxcomp/Proxy.h
parent3c79d5cf4d7a947e634c9ba769611c27158ac2ab (diff)
downloadnx-libs-51c3d42f3d15b181d58a0df1e5abac8d298d4484.tar.gz
nx-libs-51c3d42f3d15b181d58a0df1e5abac8d298d4484.tar.bz2
nx-libs-51c3d42f3d15b181d58a0df1e5abac8d298d4484.zip
Per-file copyright notices: Update copyright information in file headers that NoMachine placed there own copyright statement in.
Diffstat (limited to 'nxcomp/Proxy.h')
-rw-r--r--nxcomp/Proxy.h22
1 files changed, 15 insertions, 7 deletions
diff --git a/nxcomp/Proxy.h b/nxcomp/Proxy.h
index 87ea1ce8a..8259ddbb7 100644
--- a/nxcomp/Proxy.h
+++ b/nxcomp/Proxy.h
@@ -1,18 +1,26 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
+/* 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 NoMachine. Redistribution and use of the present */
-/* software is allowed according to terms specified in the file LICENSE */
-/* which comes in the source distribution. */
+/* are copyright of the aforementioned persons and companies. */
/* */
-/* Check http://www.nomachine.com/licensing.html for applicability. */
-/* */
-/* NX and NoMachine are trademarks of Medialogic S.p.A. */
+/* 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. */
+/* */
/**************************************************************************/
#ifndef Proxy_H