summaryrefslogtreecommitdiffstats
path: root/license.terms
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2015-06-25 07:52:36 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2015-06-25 07:52:36 (GMT)
commit7ff1c6327811218e507ea4784394a0460e90413b (patch)
tree4a35c256c764c140e6d6e0c94252eee87658ee9d /license.terms
parent448da15b7fffbb7e10b589a22c7ee059a629bf60 (diff)
downloadtcl-7ff1c6327811218e507ea4784394a0460e90413b.zip
tcl-7ff1c6327811218e507ea4784394a0460e90413b.tar.gz
tcl-7ff1c6327811218e507ea4784394a0460e90413b.tar.bz2
Fix bug in "make dist" when system-encoding is UTF-8: eolFix will then translate some windows-specific files to UTF-8 too.
Solution: commit those files with CRLF line-ending, which eliminates the need for eolFix altgether. See als: [495120] for the reason why eolFix was introduced in the first place. No longer needed with fossil.
Diffstat (limited to 'license.terms')
-rw-r--r--license.terms4
1 files changed, 2 insertions, 2 deletions
diff --git a/license.terms b/license.terms
index d44f069..fd6d69a 100644
--- a/license.terms
+++ b/license.terms
@@ -29,7 +29,7 @@ MODIFICATIONS.
GOVERNMENT USE: If you are acquiring this software on behalf of the
U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal
+in the software and related documentation as defined in the Federal
Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you
are acquiring the software on behalf of the Department of Defense, the
software shall be classified as "Commercial Computer Software" and the
@@ -37,4 +37,4 @@ Government shall have only "Restricted Rights" as defined in Clause
252.227-7013 (b) (3) of DFARs. Notwithstanding the foregoing, the
authors grant the U.S. Government and others acting in its behalf
permission to use and distribute the software in accordance with the
-terms specified in this license.
+terms specified in this license.