Author: antelder
Date: Thu Apr 9 16:12:26 2009
New Revision: 763716
URL: http://svn.apache.org/viewvc?rev=763716&view=rev
Log:
Merge LICENSE text correction from m2 to trunk
Modified:
tuscany/java/sca/modules/implementation-web-runtime/LICENSE (contents,
props changed)
Modified: tuscany/java/sca/modules/implementation-web-runtime/LICENSE
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-web-runtime/LICENSE?rev=763716&r1=763715&r2=763716&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-web-runtime/LICENSE (original)
+++ tuscany/java/sca/modules/implementation-web-runtime/LICENSE Thu Apr 9
16:12:26 2009
@@ -212,7 +212,7 @@
conditions of the following licenses.
===============================================================================
-The module host-webapp includes files under the following license:
+This module includes files under the following license:
Permission to copy, display and distribute the Service Component Architecture
Specification and/or
portions thereof, without modification, in any medium without fee or royalty
is hereby granted, provided
Propchange: tuscany/java/sca/modules/implementation-web-runtime/LICENSE
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 9 16:12:26 2009
@@ -1,2 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/implementation-web-runtime/LICENSE:671193
-/tuscany/branches/sca-java-2.0-M2/modules/implementation-web-runtime/LICENSE:763560
+/tuscany/branches/sca-java-2.0-M2/modules/implementation-web-runtime/LICENSE:763560,763712
