# HG changeset patch
# User dan.podwall@nokia.com
# Date 1238012456 18000
# Node ID 9ee3eba76b4309f4f03306095b49c3f14de7e858
# Parent  f330c1e8a4f31b436cbcfea734415740d6ae08f7# Parent  6ef327765a4ee5e54dc675f0b194fdbe19adee59
merged Warren's copyright updates

diff -r 6ef327765a4e -r 9ee3eba76b43 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/kb/CSKbManager.java
--- a/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/kb/CSKbManager.java	Wed Mar 25 12:24:24 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/kb/CSKbManager.java	Wed Mar 25 15:20:56 2009 -0500
@@ -1,6 +1,19 @@
-/**
- * Copyright (c)2007, 2008 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.internal.codescanner.kb;
 
diff -r 6ef327765a4e -r 9ee3eba76b43 debuggercdi/com.nokia.carbide.trk.support/Native/GetTRKVersion/TestGetTRKVersion/TestGetTRKVersion.cpp
--- a/debuggercdi/com.nokia.carbide.trk.support/Native/GetTRKVersion/TestGetTRKVersion/TestGetTRKVersion.cpp	Wed Mar 25 12:24:24 2009 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/Native/GetTRKVersion/TestGetTRKVersion/TestGetTRKVersion.cpp	Wed Mar 25 15:20:56 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: 
+*
+*/
 // TestGetTRKVersion.cpp : Defines the entry point for the console application.
 //
 
diff -r 6ef327765a4e -r 9ee3eba76b43 debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/connection/TCPIPConnectionFactory.java
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/connection/TCPIPConnectionFactory.java	Wed Mar 25 12:24:24 2009 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/connection/TCPIPConnectionFactory.java	Wed Mar 25 15:20:56 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.trk.support.connection;
 
 import com.nokia.carbide.remoteconnections.interfaces.*;
diff -r 6ef327765a4e -r 9ee3eba76b43 uidesigner/com.nokia.carbide.cpp.uiq.ui-feature/build.properties
--- a/uidesigner/com.nokia.carbide.cpp.uiq.ui-feature/build.properties	Wed Mar 25 12:24:24 2009 -0500
+++ b/uidesigner/com.nokia.carbide.cpp.uiq.ui-feature/build.properties	Wed Mar 25 15:20:56 2009 -0500
@@ -1,4 +1,5 @@
 bin.includes = feature.xml,\
                Carbide_Image.png,\
-               license.txt
+               license.txt,\
+	       feature.properties
 generate.feature@com.nokia.carbide.cpp.uiq.ui.source=com.nokia.carbide.cpp.uiq.ui
\ No newline at end of file
diff -r 6ef327765a4e -r 9ee3eba76b43 uidesigner/com.nokia.carbide.cpp.uiq.ui-feature/feature.xml
--- a/uidesigner/com.nokia.carbide.cpp.uiq.ui-feature/feature.xml	Wed Mar 25 12:24:24 2009 -0500
+++ b/uidesigner/com.nokia.carbide.cpp.uiq.ui-feature/feature.xml	Wed Mar 25 15:20:56 2009 -0500
@@ -346,5 +346,9 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+         
+ 	<includes
+         id="com.nokia.carbide.cpp.uiq.ui.source"
+         version="0.0.0"/>
 
 </feature>
diff -r 6ef327765a4e -r 9ee3eba76b43 uidesigner/com.nokia.sdt.uidesigner-feature/build.properties
--- a/uidesigner/com.nokia.sdt.uidesigner-feature/build.properties	Wed Mar 25 12:24:24 2009 -0500
+++ b/uidesigner/com.nokia.sdt.uidesigner-feature/build.properties	Wed Mar 25 15:20:56 2009 -0500
@@ -1,4 +1,5 @@
 bin.includes = feature.xml,\
                Carbide_Image.png,\
-               license.txt
+               license.txt,\
+	       feature.properties
 generate.feature@com.nokia.sdt.uidesigner.source=com.nokia.sdt.uidesigner
\ No newline at end of file
diff -r 6ef327765a4e -r 9ee3eba76b43 uidesigner/com.nokia.sdt.uidesigner-feature/feature.xml
--- a/uidesigner/com.nokia.sdt.uidesigner-feature/feature.xml	Wed Mar 25 12:24:24 2009 -0500
+++ b/uidesigner/com.nokia.sdt.uidesigner-feature/feature.xml	Wed Mar 25 15:20:56 2009 -0500
@@ -395,4 +395,8 @@
          version="0.0.0"
          unpack="false"/>
 
+ 	<includes
+         id="com.nokia.sdt.uidesigner.source"
+         version="0.0.0"/>
+
 </feature>