# HG changeset patch # User ryall # Date 1271105228 21600 # Node ID 5310aeaa3526f57a9d4a02898e085bc8a67f911a # Parent fab10c9fae2d8c1037837036eb1d0c56484b9f0d# Parent d6dbdb4c0be12b659ffb85784bcb43f54977f5c4 Merge license changes diff -r fab10c9fae2d -r 5310aeaa3526 carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/legal.htm --- 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 @@

License Information

COPYRIGHTS

Copyright © 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" which accompanies this distribution, and is available at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".

Copyright © 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 "Eclipse Public License v1.0" which accompanies this distribution, and is available at the URL "http://www.eclipse.org/legal/epl-v10.html".

Initial Contributors:

Nokia Corporation - initial contribution

NOTICES

diff -r fab10c9fae2d -r 5310aeaa3526 core/com.nokia.carbide.bugreport/about.html --- 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 @@

License Information

COPYRIGHTS

Copyright © 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 "Eclipse Public License v1.0" which accompanies this distribution, and is available at the URL "http://www.eclipse.org/legal/epl-v10.html".

Initial Contributors:

Nokia Corporation - initial contribution

Legal Notices

diff -r fab10c9fae2d -r 5310aeaa3526 core/com.nokia.carbide.cpp.codescanner/Tools/release_notes.txt --- 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. diff -r fab10c9fae2d -r 5310aeaa3526 core/com.nokia.carbide.cpp.doc.user/html/legal.htm --- 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 @@

License Information

COPYRIGHTS

Copyright © 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 "Eclipse Public License v1.0" which accompanies this distribution, and is available at the URL "http://www.eclipse.org/legal/epl-v10.html".

Initial Contributors:

Nokia Corporation - initial contribution

NOTICES

diff -r fab10c9fae2d -r 5310aeaa3526 core/com.nokia.carbide.cpp.sysdoc.hover/resources/help context/dl_hover/html/getting_started.html --- 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 @@

diff -r fab10c9fae2d -r 5310aeaa3526 core/com.nokia.carbide.cpp.sysdoc.hover/resources/help context/dl_hover/html/preferences.html --- 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 @@

diff -r fab10c9fae2d -r 5310aeaa3526 core/com.nokia.carbide.cpp.sysdoc.hover/resources/help context/dl_hover/html/setup.html --- 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 @@

diff -r fab10c9fae2d -r 5310aeaa3526 project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/app_to_exe.mmp --- 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. diff -r fab10c9fae2d -r 5310aeaa3526 project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/capabilities.mmh --- 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. diff -r fab10c9fae2d -r 5310aeaa3526 project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/edll.mmp --- 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. diff -r fab10c9fae2d -r 5310aeaa3526 project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/eexe.mmp --- 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. diff -r fab10c9fae2d -r 5310aeaa3526 project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/eexedll.mmp --- 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. diff -r fab10c9fae2d -r 5310aeaa3526 project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/emulator.mmp --- 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. diff -r fab10c9fae2d -r 5310aeaa3526 project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/epoc.mmp --- 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. diff -r fab10c9fae2d -r 5310aeaa3526 project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/estub.mmp --- 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. diff -r fab10c9fae2d -r 5310aeaa3526 project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/euser.mmh --- 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. diff -r fab10c9fae2d -r 5310aeaa3526 project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/euser.mmp --- 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. diff -r fab10c9fae2d -r 5310aeaa3526 project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/global_macros.mmh --- 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. diff -r fab10c9fae2d -r 5310aeaa3526 project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/kern_ext.mmh --- 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. diff -r fab10c9fae2d -r 5310aeaa3526 project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/variant.mmh --- 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. diff -r fab10c9fae2d -r 5310aeaa3526 project/com.nokia.carbide.cpp.epoc.engine.tests/data/mmp/variant_euser.mmp --- 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. diff -r fab10c9fae2d -r 5310aeaa3526 project/com.nokia.carbide.cpp.epoc.engine.tests/euser.mmh --- 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. diff -r fab10c9fae2d -r 5310aeaa3526 project/com.nokia.carbide.cpp.epoc.engine.tests/variant.mmh --- 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. diff -r fab10c9fae2d -r 5310aeaa3526 uidesigner/com.nokia.carbide.cpp.uidesigner.doc.user/html/legal.htm --- 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 @@

License Information

COPYRIGHTS

Copyright © 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 "Eclipse Public License v1.0" which accompanies this distribution, and is available at the URL "http://www.eclipse.org/legal/epl-v10.html".

Initial Contributors:

Nokia Corporation - initial contribution