You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by mi...@apache.org on 2013/10/17 13:54:39 UTC
svn commit: r1533054 - in /jmeter/trunk/licenses/bin: activation-1.1.1.txt
mail-1.4.4.txt
Author: milamber
Date: Thu Oct 17 11:54:39 2013
New Revision: 1533054
URL: http://svn.apache.org/r1533054
Log:
The original char is § (paragraph)
http://web.archive.org/web/20090305064954/http://www.sun.com/cddl/cddl.html
http://en.wikipedia.org/wiki/Common_Development_and_Distribution_License (external links section)
Modified:
jmeter/trunk/licenses/bin/activation-1.1.1.txt
jmeter/trunk/licenses/bin/mail-1.4.4.txt
Modified: jmeter/trunk/licenses/bin/activation-1.1.1.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/activation-1.1.1.txt?rev=1533054&r1=1533053&r2=1533054&view=diff
==============================================================================
--- jmeter/trunk/licenses/bin/activation-1.1.1.txt (original)
+++ jmeter/trunk/licenses/bin/activation-1.1.1.txt Thu Oct 17 11:54:39 2013
@@ -111,7 +111,7 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICE
8. U.S. GOVERNMENT END USERS.
- The Covered Software is a .commercial item,. as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as that term is defined at 48 C.F.R. º 252.227-7014(a)(1)) and .commercial computer software documentation. as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License.
+ The Covered Software is a .commercial item,. as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as that term is defined at 48 C.F.R. § 252.227-7014(a)(1)) and .commercial computer software documentation. as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License.
9. MISCELLANEOUS.
Modified: jmeter/trunk/licenses/bin/mail-1.4.4.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/mail-1.4.4.txt?rev=1533054&r1=1533053&r2=1533054&view=diff
==============================================================================
--- jmeter/trunk/licenses/bin/mail-1.4.4.txt (original)
+++ jmeter/trunk/licenses/bin/mail-1.4.4.txt Thu Oct 17 11:54:39 2013
@@ -111,7 +111,7 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICE
8. U.S. GOVERNMENT END USERS.
- The Covered Software is a .commercial item,. as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as that term is defined at 48 C.F.R. º 252.227-7014(a)(1)) and .commercial computer software documentation. as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License.
+ The Covered Software is a .commercial item,. as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as that term is defined at 48 C.F.R. § 252.227-7014(a)(1)) and .commercial computer software documentation. as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License.
9. MISCELLANEOUS.