From 3c79d5cf4d7a947e634c9ba769611c27158ac2ab Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 5 Jul 2016 13:44:32 +0200 Subject: LICENSE files: Update copyright holders, FSF address and various other minor things. --- LICENSE | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'LICENSE') diff --git a/LICENSE b/LICENSE index 32cb52b45..7923cd026 100644 --- a/LICENSE +++ b/LICENSE @@ -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 +Copyright (c) 2011-2016 Mike Gabriel +Copyright (c) 2014-2016 Ulrich Sibiller +Copyright (c) 2014-2016 Mihai Moldovan +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. -- cgit v1.2.3