# HG changeset patch
# User timkelly
# Date 1238000119 18000
# Node ID f330c1e8a4f31b436cbcfea734415740d6ae08f7
# Parent  2b2ec8fad47a1183ecfdc1ee038fad793d94968e# Parent  f5529458ffbaaaba441682215e64e2b1f6462574
commit the merge

diff -r 2b2ec8fad47a -r f330c1e8a4f3 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 11:53:32 2009 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/Native/GetTRKVersion/TestGetTRKVersion/TestGetTRKVersion.cpp	Wed Mar 25 11:55:19 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 2b2ec8fad47a -r f330c1e8a4f3 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 11:53:32 2009 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/connection/TCPIPConnectionFactory.java	Wed Mar 25 11:55:19 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 2b2ec8fad47a -r f330c1e8a4f3 project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/images/providers/ThumbnailImageModelLabelProvider.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/images/providers/ThumbnailImageModelLabelProvider.java	Wed Mar 25 11:53:32 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/images/providers/ThumbnailImageModelLabelProvider.java	Wed Mar 25 11:55:19 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.internal.project.ui.images.providers;
 
 import com.nokia.carbide.cpp.ui.images.IImageModel;