# HG changeset patch
# User timkelly
# Date 1238168927 18000
# Node ID 41baad04b9d68fc798c11aea50f6eb062c82e70a
# Parent  71c0485f97c2b14546f618e9e280bfcde60d9e09# Parent  6d2a3a6571859f65302ad4b20c5949beb5ba9482
merge in SFO CDK doc changes.

diff -r 71c0485f97c2 -r 41baad04b9d6 .hgignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Fri Mar 27 10:48:47 2009 -0500
@@ -0,0 +1,6 @@
+# use glob syntax.
+syntax: glob
+*.class
+bin
+runtime
+
diff -r 71c0485f97c2 -r 41baad04b9d6 core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/CustomAboutDialog.java
--- a/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/CustomAboutDialog.java	Fri Mar 27 10:47:09 2009 -0500
+++ b/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/CustomAboutDialog.java	Fri Mar 27 10:48:47 2009 -0500
@@ -1,3 +1,19 @@
+/*
+* 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 "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.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 package com.nokia.carbide.cpp;
 
 import java.net.URL;
diff -r 71c0485f97c2 -r 41baad04b9d6 core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/ProductPlugin.java
--- a/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/ProductPlugin.java	Fri Mar 27 10:47:09 2009 -0500
+++ b/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/ProductPlugin.java	Fri Mar 27 10:48:47 2009 -0500
@@ -1,3 +1,19 @@
+/*
+* 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 "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.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 package com.nokia.carbide.cpp;
 
 import org.eclipse.ui.plugin.*;
diff -r 71c0485f97c2 -r 41baad04b9d6 core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/ProductStartup.java
--- a/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/ProductStartup.java	Fri Mar 27 10:47:09 2009 -0500
+++ b/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/ProductStartup.java	Fri Mar 27 10:48:47 2009 -0500
@@ -1,3 +1,19 @@
+/*
+* 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 "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.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 package com.nokia.carbide.cpp;
 
 import java.lang.reflect.InvocationHandler;
diff -r 71c0485f97c2 -r 41baad04b9d6 core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/actions/DisplayReleaseNotesAction.java
--- a/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/actions/DisplayReleaseNotesAction.java	Fri Mar 27 10:47:09 2009 -0500
+++ b/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/actions/DisplayReleaseNotesAction.java	Fri Mar 27 10:48:47 2009 -0500
@@ -1,6 +1,19 @@
-/**
- * 
- */
+/*
+* 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 "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.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 package com.nokia.carbide.cpp.actions;
 
 import java.net.URL;
@@ -16,9 +29,6 @@
 public class DisplayReleaseNotesAction implements
 		IWorkbenchWindowActionDelegate {
 
-	/**
-	 * 
-	 */
 	public DisplayReleaseNotesAction() {
 	}
 
diff -r 71c0485f97c2 -r 41baad04b9d6 core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/logging/DiagnosticLog.java
--- a/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/logging/DiagnosticLog.java	Fri Mar 27 10:47:09 2009 -0500
+++ b/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/logging/DiagnosticLog.java	Fri Mar 27 10:48:47 2009 -0500
@@ -1,6 +1,19 @@
-/**
- * 
- */
+/*
+* 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 "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.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 package com.nokia.carbide.cpp.logging;
 
 import java.io.File;
diff -r 71c0485f97c2 -r 41baad04b9d6 core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/logging/DiagnosticLogGroup.java
--- a/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/logging/DiagnosticLogGroup.java	Fri Mar 27 10:47:09 2009 -0500
+++ b/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/logging/DiagnosticLogGroup.java	Fri Mar 27 10:48:47 2009 -0500
@@ -1,6 +1,19 @@
-/**
- * 
- */
+/*
+* 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 "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.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 package com.nokia.carbide.cpp.logging;
 
 import java.util.ArrayList;
diff -r 71c0485f97c2 -r 41baad04b9d6 core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/logging/DiagnosticLogManager.java
--- a/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/logging/DiagnosticLogManager.java	Fri Mar 27 10:47:09 2009 -0500
+++ b/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/logging/DiagnosticLogManager.java	Fri Mar 27 10:48:47 2009 -0500
@@ -1,3 +1,19 @@
+/*
+* 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 "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.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 package com.nokia.carbide.cpp.logging;
 
 import java.util.ArrayList;
diff -r 71c0485f97c2 -r 41baad04b9d6 core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/logging/LoggingPreferencesPage.java
--- a/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/logging/LoggingPreferencesPage.java	Fri Mar 27 10:47:09 2009 -0500
+++ b/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/logging/LoggingPreferencesPage.java	Fri Mar 27 10:48:47 2009 -0500
@@ -1,3 +1,19 @@
+/*
+* 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 "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.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 package com.nokia.carbide.cpp.logging;
 
 import java.io.File;
diff -r 71c0485f97c2 -r 41baad04b9d6 core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/preferences/ExtensionsPreferencesPage.java
--- a/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/preferences/ExtensionsPreferencesPage.java	Fri Mar 27 10:47:09 2009 -0500
+++ b/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/preferences/ExtensionsPreferencesPage.java	Fri Mar 27 10:48:47 2009 -0500
@@ -1,7 +1,19 @@
-/*******************************************************************************  
- * Copyright ©2007 Nokia Corporation. All rights reserved.                        
- *******************************************************************************/
-
+/*
+* 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 "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.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 package com.nokia.carbide.cpp.preferences;
 
 import org.eclipse.jface.preference.PreferencePage;
diff -r 71c0485f97c2 -r 41baad04b9d6 debuggercdi/com.nokia.cdt.debug.cw.symbian.tests/src/com/nokia/cdt/debug/cw/symbian/tests/AllTests.java
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian.tests/src/com/nokia/cdt/debug/cw/symbian/tests/AllTests.java	Fri Mar 27 10:47:09 2009 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian.tests/src/com/nokia/cdt/debug/cw/symbian/tests/AllTests.java	Fri Mar 27 10:48:47 2009 -0500
@@ -1,3 +1,19 @@
+/*
+* 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 "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.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 package com.nokia.cdt.debug.cw.symbian.tests;
 
 import junit.framework.Test;
diff -r 71c0485f97c2 -r 41baad04b9d6 debuggercdi/com.nokia.cdt.debug.cw.symbian.tests/src/com/nokia/cdt/debug/cw/symbian/tests/DwarfReaderTest.java
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian.tests/src/com/nokia/cdt/debug/cw/symbian/tests/DwarfReaderTest.java	Fri Mar 27 10:47:09 2009 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian.tests/src/com/nokia/cdt/debug/cw/symbian/tests/DwarfReaderTest.java	Fri Mar 27 10:48:47 2009 -0500
@@ -1,3 +1,19 @@
+/*
+* 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 "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.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 package com.nokia.cdt.debug.cw.symbian.tests;
 
 import java.io.File;
diff -r 71c0485f97c2 -r 41baad04b9d6 debuggercdi/com.nokia.cdt.debug.cw.symbian.tests/src/com/nokia/cdt/debug/cw/symbian/tests/SymbianE32ParserTest.java
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian.tests/src/com/nokia/cdt/debug/cw/symbian/tests/SymbianE32ParserTest.java	Fri Mar 27 10:47:09 2009 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian.tests/src/com/nokia/cdt/debug/cw/symbian/tests/SymbianE32ParserTest.java	Fri Mar 27 10:48:47 2009 -0500
@@ -1,6 +1,19 @@
-/**
- * 
- */
+/*
+* 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 "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.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 package com.nokia.cdt.debug.cw.symbian.tests;
 
 import java.io.File;
diff -r 71c0485f97c2 -r 41baad04b9d6 debuggercdi/com.nokia.cdt.debug.cw.symbian.tests/src/com/nokia/cdt/debug/cw/symbian/tests/SymbolReaderTest.java
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian.tests/src/com/nokia/cdt/debug/cw/symbian/tests/SymbolReaderTest.java	Fri Mar 27 10:47:09 2009 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian.tests/src/com/nokia/cdt/debug/cw/symbian/tests/SymbolReaderTest.java	Fri Mar 27 10:48:47 2009 -0500
@@ -1,3 +1,19 @@
+/*
+* 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 "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.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 package com.nokia.cdt.debug.cw.symbian.tests;
 
 import junit.framework.TestCase;
diff -r 71c0485f97c2 -r 41baad04b9d6 debuggercdi/com.nokia.cdt.debug.cw.symbian.tests/src/com/nokia/cdt/debug/cw/symbian/tests/TestsPlugin.java
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian.tests/src/com/nokia/cdt/debug/cw/symbian/tests/TestsPlugin.java	Fri Mar 27 10:47:09 2009 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian.tests/src/com/nokia/cdt/debug/cw/symbian/tests/TestsPlugin.java	Fri Mar 27 10:48:47 2009 -0500
@@ -1,3 +1,19 @@
+/*
+* 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 "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.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 package com.nokia.cdt.debug.cw.symbian.tests;
 
 import java.io.File;