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 /LICENSE | |
| 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 'LICENSE')
| -rw-r--r-- | LICENSE | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -1,6 +1,12 @@ -Copyright (c) 2001, 2011 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) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de> +Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de> +Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) -NX-X11 and NX extensions to X are copyright of NoMachine. +nx-X11, NX extensions to X (nxcompext, nxcompshad), nxagent and nxproxy +are copyright of the aforementioned copyright holders. Redistribution and use of this software is allowed according to the following terms: @@ -16,8 +22,8 @@ Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, you can request a copy to NoMachine -or write to the Free Software Foundation, Inc., 59 Temple Place, -Suite 330, Boston, MA 02111-1307 USA +or write to the Free Software Foundation, Inc., 51 Franklin Street, +Fifth Floor, Boston, MA 02110-1301 USA Parts of this software are derived from XFree86 and X.org projects. Other copyrights and the MIT/X11 license applies to different sources. |