fixed bug #'s 9624, 9625 and 9626.

fixed GCCE error parser & tests to work with CDT 6.0 changes.

fixed bug #9283.

Bug 9619 - make sure saving model in main thread

fixed bug #9332.

cleaned up imports.

Updated bug reporter to use ProxyUtils class from com.nokia.cpp.utils.core plugin to retrieve proxy data.

Updated news reader to use ProxyUtils class from com.nokia.cpp.utils.core plugin to retrieve proxy data.

Hide the new CDT group launch for now.

merge commit

makmake error parser regression tests (reference data). Fix bug 9620, NPE when adding bogus path to PRJ_MMPFILES in bld.inf.

merge change for EDC from carbidecpp35

Fix a remote connections test and remove another obsolete test from suite

daily merge

updated URL to point to symbian foundation in about box

fix bug 9582

fix bug 9582

fix bug 9582

fix bug 9582.

Add ProxyUtils and use in TRK package installer

merged

merged from 2_1 branch.

Bug 9601 - need writable project description to modify config data, but additional call to setProjectDescription is superfluous and causes exception due to recursive call to setProjectDescription

Updated news reader to use proxy data provided by Eclipse when creating http connections; fix for Bug 9564.

merge

Merge from 2.2 branch

daily merge

additional broken lins fixed and one image re-added to manual

updated bugs fixed for 2.2

updated release notes for 2.2

fixed 2.1.1 build.

SF bugzilla 221 - delete cleanup object before returning non NULL createError

Bug 9556 Welcome Tab > Opens as a view in the Carbide perspective rather than a maximized tab

fix about box, bug 9554.

Bug 9592 - fix formatter id - seems to no longer need leading undersocre

avoid possible NPE when closing connection wizard

Merge from HEAD. Support for automated tests to select a process for an attach to process launch configuration without using the UI.

Updated after code review. Modified attribute check for efficiency and hardened OSProcess selection using OSProcess.parseProcess()

merge done

lets try telling mercurial that the files are really really gone

removed duplicate pages, unused images, and fixed links to same

merge commit

Bug 9566. Serialize the saving of Carbide project data and Carbide launguage data. New CDT 6.0 thorws exception if not done.

To support automated testing, added new attach to process launch configuration setting to support silently setting the process to attach to without displaying the process chooser dialog.

merge commit

Bug 9569 - only mark buffer dirty when editor is dirty

merge

Updated image to show missing option

Bugs 9560, 9572. Updated activityPatternBindings to match new launch type IDs in CDT.

fixed executables view merge problems - bug #'s 9562, 9568, 9571.

replaced Ganymede with Galileo name

Turn keepalive back on to be compatible with 2.0.x releases.

Build for Eclipse 3.5 and CDT 6.0.

merge build breaks from Austin/dev/ide/carbidecpp35/MCL_carbidecpp35. Made to build with Eclipse 3.5 and CDT 6.0.

update batch file and README for Symbian Foundation build

Updated release notes for Eclipse 3.5, CDT 6.0, and Java 6.0 changes

do not use SF_build repository

add Symbian Foundation build scripts

[Bug 9514] Fix NPE

don't rely on all services reporting in-use together for UI to show connection in use

Return a copy of data

Don't use internal platsim name (moved to Session.java)

Don't use platstim keyword. Moved to internal (under Session.java)

removed debug non-xip option.

minor 2.2 updates to visible text in product

updated splash screen for 2.2

set version to 2.1.1

set version to 2.2.0

write .branch.txt to make the new head

write .branch.txt to make the new head

add branch RCL_2_1

updated contents of the Symbian OS data view.

fixed location of debugger directory for debug builds (no change for regular Carbide release builds).

Updated CodeScanner release notes for version 2.1.3

fix bug 9433 - also some logging changes

add 2.1 to update site name - Carbide.c++ 2.1 Update Site

updated bug fixes for final 2.1

[Bug 9220] Add deprecated tags for internal implementation classes

refactor SBVModelFactory to internal package.

API fixes per bug 9220

refactoring SBVModelFactort to internal package

refactor from public API (this is internal)

Added missing @since tags; fix for Bug 9220.

Added missing @since tags; fix for Bug 9220.

Added missing @since tags; fix for Bug 9220.

Added missing @since tags; fix for Bug 9220.

merge commit

Updated for version 2.1.3

change update site folder from carbide211 to carbide 21

merge with Duane changes

minor edits to dependency tracking page

change update site to carbide211

merge commit

fix bug 9320

merge tims changes

[bug 9352] added emulation item, removed outdated paragraph, and converted auto to automatic

moved UID and PI notes to right column of welcome page

Fix bug 9212. Clarify an API.

merge

[bug 9349] fixed broken link in XML file

[bug 9345] Revised text to bold and revised new feature icons

[bug 9252] revised link on setup page

add clean command to icon makefiles

[Bug 9392] Filter connection types with no compatible services from settings wizard (unless editing a connection of that type)

add clean command to actually delete mif file

[Bug 8934] Ensure we create the devices.xml at the same location where we try to read it. Refactor copied method so single method called from SDKManager in core by SDKPreferencePage in ui. Ensure errors are reported in error log. Show dialog when unable to add SDK.

merged

[bug 9369] removed sales link from page

[bug 9368] Updated images to show Project Explorer vice C/C++ Projects

[bug 9367] Added test item to list and updated image to include test submenu

add a deprecated API in CarbideCPPBuilder

Fix API break, add back in generateAbldMakefileIfNecessary(ICarbideBuildConfiguration, CarbideCommandLauncher, IPath, boolean), but leave deprecated.

merged Tims changes

[bug 9366] melded TOC with menu options shown in manual

bug 9343 fixed broken link

minor edits to fix possessive error

updated banner version to 2.1

add documentation and hook up tray dialog for abld deps tracking query (bug 9227)

initial commit

tweak text of dependency tracking query dialog

change version from 2.0 to 2.0.4 on carbidehelp.nokia.com

[Bug 9335] Optimize checking for duplicate problem markers on the same resource + remove sleep and instead ensure unique creation time using internal platform apis

merge

added Dependency Tracking page to TOC with related context help update as well

localize strings for new prefx checkbox

add query dialog to promt user whether or not to allow carbid eto track dependencies (over existing abld-generated makefiles)

initial commit

replaced ampersand in title that caused build issues

minor edits

fixed bug 9326 by clarifying option choices and updating image

compared css files and merged as necessary

Fixed bug 9252 by updating link to point to FN site for hover help library plug-ins

creating new project task needed reordering and updated images

updated Diagnostic pref image

merge

minor edits to bring compiler manual in sync with latest release

Fix OS version for chnange in SDK

merge

Merge SDK Support page with Working with SDKs and cleaned up broken links and references to deleted page

updated Step color to match Symbian Yellow #FDCB2F

removed empty Carbide Tools page and updated links and TOC

added note to Hover Help bullet on downloading Developer Libraries for specific SDKs

updated release date

update test for plat macros to use newer SDK (S60 5th ed.)

merge

updated release notes, bug fixes, and TOC to showinternal versions for tghe SymSee layoouts

[Bug 8556] C-escape multi line copyright in#defines

move string utility function into utils class

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