Merge branch '3.6.x'

1 files changed, 0 insertions, 36 deletions

diff --git a/nxproxy/LICENSE b/nxproxy/LICENSE
deleted file mode 100644
index 64522ca4c..000000000
--- a/nxproxy/LICENSE
+++ /dev/null
@@ -1,36 +0,0 @@
-Copyright (c) 2001, 2011 NoMachine - http://www.nomachine.com/.
-
-NXPROXY and NX extensions to this software are copyright of NoMachine.
-Redistribution and use of this software is allowed according to the
-following terms:
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License Version 2, and
-not any other version, as published by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-
-Parts of this software are derived from DXPC project. These copyright
-notices apply to original DXPC code:
-
-Redistribution and use in source and binary forms are permitted provided
-that the above copyright notice and this paragraph are duplicated in all
-such forms.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-Copyright (c) 1995,1996 Brian Pane
-Copyright (c) 1996,1997 Zachary Vonler and Brian Pane
-Copyright (c) 1999 Kevin Vigor and Brian Pane
-Copyright (c) 2000,2001 Gian Filippo Pinzari and Brian Pane
-
-All rights reserved.