From e9db3a4cf7a6a292e74a8d77868eb356107591ca Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Thu, 22 Sep 2016 20:37:57 -0700 Subject: Going back to unmodified 2-Clause BSD License. * LICENSE: Reverted to Two-Clause BSD license. The copyright of the Linenoise library are included, because it uses exactly the same license. A note is added about MPI being in the public domain. * LICENSE-CYG: Revised text to clarify the situation that Cygnal is only bundled with a particular Windows build of TXR. * METALICENSE: Revised text. All references to modifications to the BSD license are removed. Gives pointers to the MPI and linenoise license files. Notes that linenoise is under the Two-Clause BSD also. Makes a note about Cygnal and points to LICENSE-CYG. * inst.nsi: Remove the text which tells the user that use of the program requires agreement with the license; refer only to redistribution. The "Agree" buttons are renamed "Acknowledge". * mpi/make-logtab, mpi/mpi.c, mpi/mpi.h, mpi/mplogic.c, mpi/mplogic.h: Remove copyright notices and "all rights reserved", since the author had placed this into the public domain, as made explicit in the README file. --- inst.nsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'inst.nsi') diff --git a/inst.nsi b/inst.nsi index 55056056..bf735b3d 100644 --- a/inst.nsi +++ b/inst.nsi @@ -23,13 +23,13 @@ Function .onInstSuccess FunctionEnd PageEx license - LicenseText "Use and redistribution of TXR requires agreement with terms of the license." "Agree" + LicenseText "Redistribution of TXR requires agreement with terms of the license." "Acknowledge" LicenseData LICENSE Caption ": Licensing" PageExEnd PageEx license - LicenseText "Use and redistribution of this version of TXR also requires agreement with Cygwin's license." "Agree" + LicenseText "Redistribution of this version of TXR also requires agreement with Cygwin's license." "Acknowledge" LicenseData LICENSE-CYG Caption ": Licensing" PageExEnd -- cgit v1.2.3