put better assert failure message

Updated H1 image color to SFO orange

Added TRK improvements

Bug 9328 - Import parses MMP files that are not selected, for each configuration selected

merged

added keywords to Build COnfig, Macros, and Project Settings property pages

added keywords to Codescanner property page

add parameter to import utils to select between builds (sbsv1 or sbsv2)

Updated web resource links to point to SFO now

Updated links to point to SFO instead of FN as well as minor edits

Minor edits to message strings for clarity

Build Options added to index

Build Options context help added

Updated New Launch Config and Launch Config Main pages

[Bug 9322] Set help ID on control, not contents

[Bug 9282] Add creation stats reporting

fix a restore defaults glitch

add initial engineering support for SBSv2 single file compilation.

Turn off reference project tests until someone begins working on UI designer code since they need to be updated to work with latest versions of SDKs on build server.

Fix for Bug 8513.

BRANDING minor edits to color settings to match SFO colors

minor edits to release notes

Removed period from discover customization option

merge

minor edits

BUG 7946 - replaced Thunk with Chunk

Fix bug 9310. Fix save problem with Platform Filter Prefs (sbsv2) and add Restore / Apply buttons.

added note on Carbide extensions section in property dialogs

moved and updated page with category wizard page

added keywords to diagnostic log pref panel

added new launch config wizard item to release notes

BRANDING - updated splash to use official symbian colors

updated body font to Verdana as per sfo guidelines

updated release notes and bug fixes for 2.1

argh, merge

merge again, sigh

merge

commit debugger changes

Added indexing option to Carbide preferences page and updated image

Added additional keywords to Carbide.c++ pref panel

[Bug 9230] Don't force rebuilding cache unless pref is set to index only mmps from build

[Bug 9230] Get parent folder of rss/aif and not top level so we can still honor the index only build mmps pref + restore and deprecate original source root method since it was API and create a new one to use with pref behavior

merge

Don't get hrh file timestamps more than once per second

fix bug 9268 (merge commit)

fix bug 9268

fix bug 9268

fixed several problems with default launch values causing the apply button to become enabled when nothing had chaned - fixes bug #9275.

merged

fixed problem with my last commit - fixes bug #9276.

cosmetic change - add more margin to second group box

merge

Updated some broken links for Launch Configurations

[Bug 9230] Only create source roots for build components, overridable by pref

[Bug 9230] Only create source roots for build components, overridable by pref

Bug#7946 - Edited OS Data view tooltips

merge

Added keywords to Preprocess pref panel

merge

Added keywords to SDK Pref and Platform Filtering preference panels

added new API notes for ISymbianSDK

fix bug 9032. Only scan SDKs for plugins once for an IDE configuration lifetime.

merged

fixed a couple of problems where the apply button on the launch config dialog would become enabled by mistake.

Added missing Launch Types header page and revised TOC entry

Added new Launch Category section to New Launch Configuration wizard page

Added keywords to Carbide.c++ pref panel

Added keywords to Build pref panel

Added test interface methods to access INF/MMP editor view models.

Added keywords to Codescanner preference panel

Added keywords to News Reader pref panel

Added keywords to UI Designer preference panel

Added additional filter terms to System Search pref panel

Added missing properties page containing filter definitions

Added keywords for Hover Help pref panel filtering

Added keywords for pref panel filtering

Added keywords to pref panel for filtering

Updated getErrorMessage() methods for accessing error messages from various INF and MMP editor pages.

fixed bug #9235.

merged

added the new launch wizard UI and updated existing wizards to match. fixed bug where the launch wizard wasn't taking into account if a launch type supported the given mode (run/debug). fixed some problems with the refactor of the t32 and platsim into their own plugins.

Added similiarly worded pointers between 2 versions of plugin_customization.ini

fix bug 9221. When calculating the project root, don't use sourcepaths that don't exist

merged

added Carbide Extensions project property page (bug #9218).

bug 8630 - updated TOC path as well

merge

bug 8630 - revised page and images to clarify MMP file creation

merged

minor cleanup.

removed unnecessary context launch stuff and fixed up some warnings.

fixed NPE if DE were to fail to load a symbol file.

removed unnecesssary context launch code. cleaned up for easier platsim integration.

cleaned up how we locate and load cwnative.dll and de.exe.

merge heads

changed TOC entry to Launch types

Add refresh logging to core resources plugin

merged

executables view changes

fix bug 9142. Fix PRODUCT_INCLUDE macros problems with deps tracking on cpp.exe

fix bug 9188

fix bug 9168

Added testing interface methods to access error messages from various pages of the INF and MMP editor.

fix bug 8964

update from Frank who says there were some duplicates

fix error parser bug 9091

removed unused file

Use LinkedHashMap instead of Map to preserve build include order. Add test to insure expected order

updated run mode cheatsheet

minor edits to cheatsheets

merged heads

removed composite setting from new cheatsheets

use base platform name when calling bldmake bldfiles (rather than potential variant name)

cleanup some API/javadoc. Add API changes for SBV support.

[Bug 9031] set source roots at actual source root based on new cdt pref

merge commit

clean up imports

Merge commit

Improved test of saving to feed cache.

Fix for Bug 9092.