# HG changeset patch
# User dadubrow
# Date 1237994360 18000
# Node ID f5529458ffbaaaba441682215e64e2b1f6462574
# Parent  1c819827dd3ad5672e559f6b5c2ea0697af442a0# Parent  262073b0eb3db23931ce074469618740aab875b6
merge commit

diff -r 1c819827dd3a -r f5529458ffba 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 10:16:59 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/kb/CSKbManager.java	Wed Mar 25 10:19:20 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 1c819827dd3a -r f5529458ffba uidesigner/com.nokia.carbide.cpp.uiq.ui-feature/feature.xml
--- a/uidesigner/com.nokia.carbide.cpp.uiq.ui-feature/feature.xml	Wed Mar 25 10:16:59 2009 -0500
+++ b/uidesigner/com.nokia.carbide.cpp.uiq.ui-feature/feature.xml	Wed Mar 25 10:19:20 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 1c819827dd3a -r f5529458ffba uidesigner/com.nokia.sdt.uidesigner-feature/feature.xml
--- a/uidesigner/com.nokia.sdt.uidesigner-feature/feature.xml	Wed Mar 25 10:16:59 2009 -0500
+++ b/uidesigner/com.nokia.sdt.uidesigner-feature/feature.xml	Wed Mar 25 10:19:20 2009 -0500
@@ -395,4 +395,8 @@
          version="0.0.0"
          unpack="false"/>
 
+ 	<includes
+         id="com.nokia.sdt.uidesigner.source"
+         version="0.0.0"/>
+
 </feature>