# HG changeset patch
# User timkelly
# Date 1282758129 18000
# Node ID e8d8fb31697dedfec02d444c6baff728f6178a9d
# Parent  6507baa94ab88b8b776d3fdbb8a11366771da731# Parent  fccb2e8f8b9b93a0609e4399ae84e3033d897072
merge from C3_BUILDER_WORK

diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/concepts/images/wnd_workspace_launcher.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/concepts/images/workbench.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/images/gold_header.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/images/views/perspective_debug.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/debugging_project_02.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/debugging_project_04.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/debugging_project_05.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/debugging_project_07.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/debugging_project_08.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/debugging_project_09.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/debugging_project_10.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/debugging_project_11.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/debugging_project_12.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/debugging_project_13.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/debugging_project_14.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/dlg_build_project_progress.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/dll_attach_to_process.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/dll_build_project.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/dll_change_debug_process.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/dll_change_remote_connection.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/dll_new_launch_config.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/dll_other_settings.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/icon_build_project.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/icon_debug.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/icon_edit_settings.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/icon_project_built.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/icon_project_error_badge.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/icon_project_warning_badge.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/icon_run.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/menu_new_proj_build_project.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_build_project_console_view.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_build_project_executables_view.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_build_project_problems_view.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_dll_project_02.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_dll_project_03.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_dll_project_04.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_dll_project_07.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_launch_config_03.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_launch_config_04.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_launch_config_05.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_launch_config_08.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_project_template_01.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_project_template_02.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_project_template_07.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/pref_cdt_build_console.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/run_mode_debug_01.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/run_mode_debug_02.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/run_mode_debug_05.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/run_mode_debug_06.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/images/run_mode_debug_07.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/filter_launch_config.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/page_exceptions.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/MMP_wizard.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/MMP_wizard2.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/add_images_from_filesys.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/add_images_from_project.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/build_pkg_file.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/build_symbian_comp.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/carbide_build_config.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/carbide_macro_settings.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/carbide_proj_settings.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/carbide_proj_settings_sbsv1.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/clean_symbian_comp.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/icon_install_extensions.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/icon_periodic_testing.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/icon_show_overview.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/import_bld_inf_01.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/import_bld_inf_02.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/import_bld_inf_03.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/import_bld_inf_04.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/import_bld_inf_05.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/inf_editor_addMMP.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/inf_editor_addMake.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/inf_editor_overview.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_memory_rendering_options.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_symb_abld.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_symb_compile.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_symb_freeze_comp.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_symb_freeze_exports.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_symb_preprocess.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/mmp_editor.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/mmp_editor_libraries.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/mmp_editor_mmpfile.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/mmp_editor_options.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/mmp_editor_sources.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/pref_indexer.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/pref_indexer_properties.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/pref_launch_config_filter.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/prefs_carbide_cpp.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/prefs_symbian_sdks.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_carbide_portal.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_install_extensions.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_memory.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_project_explorer.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_remote_connections.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_show_overview_popup.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_sym_proj_nav.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_system_search.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/wiz_new_class.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_ad_sdk.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_edit_mbm_contents.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_pref_code_styles.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_system_search.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_system_search_prefs.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/tasks/images/menu_reformat_source_file.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/tasks/images/pref_code_style_differences.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/tasks/images/wnd_customize_perspective.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/tasks/images/wnd_customize_perspective_cmds.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/tasks/images/wnd_customize_perspective_menus.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/tasks/images/wnd_customize_perspective_shortcuts.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/clean.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/images/wnd_sdk_platform_filter.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/images/wnd_sdk_platform_filter_sbsv2.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/tasks/start/images/debug_set_breakpoint.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/tasks/start/images/wnd_symbian_emulator_01.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/tasks/start/images/wnd_symbian_emulator_02.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp.doc.user/html/tasks/start/images/wnd_symbian_emulator_03.png
diff -r fccb2e8f8b9b -r e8d8fb31697d core/com.nokia.carbide.cpp/icons/gold_header.png