# HG changeset patch
# User Ed Swartz <ed.swartz@nokia.com>
# Date 1283451572 18000
# Node ID aac450e0c99e868557ec98062b8ea34f7ebd6950
# Parent  c7e4f77e6b70364f5c619659e0c3290628b78862# Parent  8193259c7a9551083c68941d8dcc91361fa9fb23
Merge commit

diff -r 8193259c7a95 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/menu_build_target.png
diff -r 8193259c7a95 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_config_debug_as.png
diff -r 8193259c7a95 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_new_launch_config.png
diff -r 8193259c7a95 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/reference/images/panel_global_debugger.png
diff -r 8193259c7a95 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/reference/images/prefs_build_workspace.png
diff -r 8193259c7a95 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/reference/images/prefs_preprocess.png
diff -r 8193259c7a95 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_add_sdk.png
diff -r 8193259c7a95 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_sis_properties.png
diff -r 8193259c7a95 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_name_location.png
diff -r 8193259c7a95 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_step1.png
diff -r 8193259c7a95 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_step2.png
diff -r 8193259c7a95 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_step4.png
diff -r 8193259c7a95 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_step5.png
diff -r 8193259c7a95 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_step6.png
diff -r 8193259c7a95 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_step7.png
diff -r 8193259c7a95 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/attach_to_process_launch_config.png
diff -r 8193259c7a95 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/attach_to_process_proj_explorer.png
diff -r 8193259c7a95 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/build_console.png
diff -r 8193259c7a95 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/menu_build_project.png
diff -r 8193259c7a95 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/sis_builder_tab.png
diff -r 8193259c7a95 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/images/wnd_sdk_properties.png
diff -r 8193259c7a95 -r aac450e0c99e core/com.nokia.carbide.templatewizard/src/com/nokia/carbide/internal/api/templatewizard/ui/TemplateWizard.java
--- a/core/com.nokia.carbide.templatewizard/src/com/nokia/carbide/internal/api/templatewizard/ui/TemplateWizard.java	Thu Sep 02 11:47:53 2010 -0500
+++ b/core/com.nokia.carbide.templatewizard/src/com/nokia/carbide/internal/api/templatewizard/ui/TemplateWizard.java	Thu Sep 02 13:19:32 2010 -0500
@@ -111,7 +111,7 @@
 		job.schedule();
 		
 		String featureName = getFeatureName();
-		if (featureName != null && !featureName.isEmpty()) {
+		if (featureName != null && featureName.length() > 0) {
 			FeatureUseTrackerPlugin.getFeatureUseProxy().useFeature(featureName);
 		}