Merge license changes
authorryall
Mon, 12 Apr 2010 14:47:08 -0600
changeset 1205 5310aeaa3526
parent 1202 fab10c9fae2d (current diff)
parent 1201 d6dbdb4c0be1 (diff)
child 1207 e265bbe56eb0
Merge license changes
--- a/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/legal.htm	Mon Apr 12 14:10:49 2010 -0500
+++ b/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/legal.htm	Mon Apr 12 14:47:08 2010 -0600
@@ -10,7 +10,7 @@
 <body>
 <h2>License Information</h2>
 <h5>COPYRIGHTS</h5>
-<p>Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. This component and the accompanying materials are made available under the terms of the License &quot;Symbian Foundation License v1.0&quot; which accompanies this distribution, and is available at the URL &quot;<a href="http://www.symbianfoundation.org/legal/sfl-v10.html">http://www.symbianfoundation.org/legal/sfl-v10.html</a>&quot;. </p>
+<p>Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. This component and the accompanying materials are made available under the terms of the License &quot;Eclipse Public License v1.0&quot; which accompanies this distribution, and is available at the URL &quot;<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>&quot;. </p>
 <h5>Initial Contributors:</h5>
 <p> Nokia Corporation - initial contribution</p>
 <h5>NOTICES</h5>
--- a/core/com.nokia.carbide.bugreport/about.html	Mon Apr 12 14:10:49 2010 -0500
+++ b/core/com.nokia.carbide.bugreport/about.html	Mon Apr 12 14:47:08 2010 -0600
@@ -10,7 +10,7 @@
 <body lang="en-us">
 <h2>License Information</h2>
 <h5>COPYRIGHTS</h5>
-<p>Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. This component and the accompanying materials are made available under the terms of the License &quot;Symbian Foundation License v1.0&quot; which accompanies this distribution, and is available at the URL &quot;<a href="http://www.symbianfoundation.org/legal/sfl-v10.html">http://www.symbianfoundation.org/legal/sfl-v10.html</a>&quot;. </p>
+<p>Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. This component and the accompanying materials are made available under the terms of the License &quot;Eclipse Public License v1.0&quot; which accompanies this distribution, and is available at the URL &quot;<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>&quot;. </p>
 <h5>Initial Contributors:</h5>
 <p> Nokia Corporation - initial contribution</p>
 <h5>Legal Notices</h5>
--- a/core/com.nokia.carbide.cpp.codescanner/Tools/release_notes.txt	Mon Apr 12 14:10:49 2010 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/Tools/release_notes.txt	Mon Apr 12 14:47:08 2010 -0600
@@ -2,9 +2,9 @@
 # Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Symbian Foundation License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
 # Initial Contributors:
 # Nokia Corporation - initial contribution.
--- a/core/com.nokia.carbide.cpp.doc.user/html/legal.htm	Mon Apr 12 14:10:49 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/legal.htm	Mon Apr 12 14:47:08 2010 -0600
@@ -10,7 +10,7 @@
 <body>
 <h2>License Information</h2>
 <h5>COPYRIGHTS</h5>
-<p>Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. This component and the accompanying materials are made available under the terms of the License &quot;Symbian Foundation License v1.0&quot; which accompanies this distribution, and is available at the URL &quot;<a href="http://www.symbianfoundation.org/legal/sfl-v10.html">http://www.symbianfoundation.org/legal/sfl-v10.html</a>&quot;.  </p>
+<p>Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. This component and the accompanying materials are made available under the terms of the License &quot;Eclipse Public License v1.0&quot; which accompanies this distribution, and is available at the URL &quot;<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>&quot;.  </p>
 <h5>Initial Contributors:  </h5>
 <p>Nokia Corporation - initial contribution</p>
 <h5>NOTICES</h5>
--- a/core/com.nokia.carbide.cpp.sysdoc.hover/resources/help context/dl_hover/html/getting_started.html	Mon Apr 12 14:10:49 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover/resources/help context/dl_hover/html/getting_started.html	Mon Apr 12 14:47:08 2010 -0600
@@ -47,7 +47,7 @@
 								<br /><br />
 										<div id="footer"><hr>
 											<p id="copyright">
-Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.symbianfoundation.org/legal/sfl-v10.html">http://www.symbianfoundation.org/legal/sfl-v10.html</a>.</p>        
+Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</p>        
 							  </div>   
 									</div> 
 								</div>
--- a/core/com.nokia.carbide.cpp.sysdoc.hover/resources/help context/dl_hover/html/preferences.html	Mon Apr 12 14:10:49 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover/resources/help context/dl_hover/html/preferences.html	Mon Apr 12 14:47:08 2010 -0600
@@ -115,7 +115,7 @@
 								<br /><br />
 										<div id="footer">        
 											<p id="copyright">
-Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.symbianfoundation.org/legal/sfl-v10.html">http://www.symbianfoundation.org/legal/sfl-v10.html</a>.</p>        
+Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</p>        
 										</div>   
 									</div> 
 								</div>
--- a/core/com.nokia.carbide.cpp.sysdoc.hover/resources/help context/dl_hover/html/setup.html	Mon Apr 12 14:10:49 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover/resources/help context/dl_hover/html/setup.html	Mon Apr 12 14:47:08 2010 -0600
@@ -85,7 +85,7 @@
 								<br /><br />
 										<div id="footer">        
 											<p id="copyright">
-Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.symbianfoundation.org/legal/sfl-v10.html">http://www.symbianfoundation.org/legal/sfl-v10.html</a>.</p>        
+Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</p>        
 									  </div>   
 									</div> 
 								</div>
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/app_to_exe.mmp	Mon Apr 12 14:10:49 2010 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/app_to_exe.mmp	Mon Apr 12 14:47:08 2010 -0600
@@ -2,9 +2,9 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/capabilities.mmh	Mon Apr 12 14:10:49 2010 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/capabilities.mmh	Mon Apr 12 14:47:08 2010 -0600
@@ -2,9 +2,9 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/edll.mmp	Mon Apr 12 14:10:49 2010 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/edll.mmp	Mon Apr 12 14:47:08 2010 -0600
@@ -2,9 +2,9 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/eexe.mmp	Mon Apr 12 14:10:49 2010 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/eexe.mmp	Mon Apr 12 14:47:08 2010 -0600
@@ -2,9 +2,9 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/eexedll.mmp	Mon Apr 12 14:10:49 2010 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/eexedll.mmp	Mon Apr 12 14:47:08 2010 -0600
@@ -2,9 +2,9 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/emulator.mmp	Mon Apr 12 14:10:49 2010 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/emulator.mmp	Mon Apr 12 14:47:08 2010 -0600
@@ -2,9 +2,9 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/epoc.mmp	Mon Apr 12 14:10:49 2010 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/epoc.mmp	Mon Apr 12 14:47:08 2010 -0600
@@ -2,9 +2,9 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/estub.mmp	Mon Apr 12 14:10:49 2010 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/estub.mmp	Mon Apr 12 14:47:08 2010 -0600
@@ -2,9 +2,9 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/euser.mmh	Mon Apr 12 14:10:49 2010 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/euser.mmh	Mon Apr 12 14:47:08 2010 -0600
@@ -2,9 +2,9 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/euser.mmp	Mon Apr 12 14:10:49 2010 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/euser.mmp	Mon Apr 12 14:47:08 2010 -0600
@@ -2,9 +2,9 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/global_macros.mmh	Mon Apr 12 14:10:49 2010 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/global_macros.mmh	Mon Apr 12 14:47:08 2010 -0600
@@ -2,9 +2,9 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/kern_ext.mmh	Mon Apr 12 14:10:49 2010 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/kern_ext.mmh	Mon Apr 12 14:47:08 2010 -0600
@@ -2,9 +2,9 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/variant.mmh	Mon Apr 12 14:10:49 2010 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/variant.mmh	Mon Apr 12 14:47:08 2010 -0600
@@ -2,9 +2,9 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/variant_euser.mmp	Mon Apr 12 14:10:49 2010 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/variant_euser.mmp	Mon Apr 12 14:47:08 2010 -0600
@@ -2,9 +2,9 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/euser.mmh	Mon Apr 12 14:10:49 2010 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/euser.mmh	Mon Apr 12 14:47:08 2010 -0600
@@ -2,9 +2,9 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/variant.mmh	Mon Apr 12 14:10:49 2010 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/variant.mmh	Mon Apr 12 14:47:08 2010 -0600
@@ -2,9 +2,9 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
--- a/uidesigner/com.nokia.carbide.cpp.uidesigner.doc.user/html/legal.htm	Mon Apr 12 14:10:49 2010 -0500
+++ b/uidesigner/com.nokia.carbide.cpp.uidesigner.doc.user/html/legal.htm	Mon Apr 12 14:47:08 2010 -0600
@@ -10,7 +10,7 @@
 <body>
 <h2>License Information</h2>
 <h5>COPYRIGHTS</h5>
-<p>Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. This component and the accompanying materials are made available under the terms of the License &quot;Symbian Foundation License v1.0&quot; which accompanies this distribution, and is available at the URL &quot;<a href="http://www.symbianfoundation.org/legal/sfl-v10.html">http://www.symbianfoundation.org/legal/sfl-v10.html</a>&quot;. </p>
+<p>Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. This component and the accompanying materials are made available under the terms of the License &quot;Eclipse Public License v1.0&quot; which accompanies this distribution, and is available at the URL &quot;<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>&quot;. </p>
 <h5>Initial Contributors:</h5>
 <p> Nokia Corporation - initial contribution</p>
 <h5>NOTICES</h5>