summaryrefslogtreecommitdiffstats
path: root/inst.nsi
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2016-09-22 20:37:57 -0700
committerKaz Kylheku <kaz@kylheku.com>2016-09-22 20:37:57 -0700
commite9db3a4cf7a6a292e74a8d77868eb356107591ca (patch)
treec1a3772cbc15bf7438f3e69fde9b24f832de4e28 /inst.nsi
parentdf256d21a107b9bc30f571e0b7220186ff999e62 (diff)
downloadtxr-e9db3a4cf7a6a292e74a8d77868eb356107591ca.tar.gz
txr-e9db3a4cf7a6a292e74a8d77868eb356107591ca.tar.bz2
txr-e9db3a4cf7a6a292e74a8d77868eb356107591ca.zip
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.
Diffstat (limited to 'inst.nsi')
-rw-r--r--inst.nsi4
1 files changed, 2 insertions, 2 deletions
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