branch merge

fixed some typos in pref and launch config views

enable p2 update site UI

enable p2 update site UI

updated css file for crash debugger

revised copyright info on title page for crash debugger docs

add Symbian Foundation build scripts

Fixed adding TrollTech Qt code style named "Qt"

branch merge

updated css files to include SFO style additions

Qt templates should have rss file being built in symbian block

Added TrollTech Qt Code Style (named "Qt).

updated release note link on welcome page

branch merge

BUG 9887 - revised CDK docs with improved import binary project with linked content steps with additional images

adding schema/ to bin.includes so that launch extensions can load

Adding schema/ to bin.includes so that launch extensions can load

Updated to handle double quote when generating "Mark Read" link; fix for Bug 9888.

Updated to handle double quote when generating "Mark Read" link; fix for Bug 9888.

change version to 3.0.0

updated feauture/build properties for com.nokia.carbide.cpp.sdk

updated feauture/build properties for com.nokia.carbide.cpp.sdk

fix capitalization

fix capitalization

updated about box version number

BUG 9854 - edited plugin.properties torevise version number to 2.3

merge heads

add different logging to send & recieve messages so we can see the messages better in debug version

modify how we determine if the TCFServer process creator is still alive - this will help in killing orphan TCFServer processes on startup

Carbide 2.3.0 changes for ISDKManager

Carbide 2.3.0 changes for ISDKManager

Manually merge in changeset 501:c39dede7ad37 from default.

fix bugs 7659 & 9755

set version to 1.0.0.qualifier for ATF plugins

set version to 1.0.0.qualifier for ATF plugins

remove version from Carbide.c++ Update Site label

change version to 2.3

Change name to "Classic"

minor correction to image

BUG #9797 - updated setup instructions to import using Binary Project with Linked Content versus Source Project

added draft support for new features and bug fixes

revised splash, welcome, welcome text to 3.0

revised splash, welcome, and welcome text for 2.3

revised splash, welcome, welcome text for 3.0

changed 2.2 to 3.0

write .branch.txt to make new head

write .branch.txt to make new head

add branch RCL_2_2

daily merge

updated Main page of launch config tables and images

Fix Bug 9787 - Carbide gets its SDK list out of sync with devices.xml

updated css to better match book.css

BUG 9737 - fixed some additional broken links in index and TOC

fix bug 9769 (problem importing with SBV tries to extend itself)

minor changes to project files

Debug logging changes

Debug logging changes

Decrease TCFServer response timeout to 10 seconds

removed unused pages and images for watchpoints, variables, and expressions

BUG 9741 - updated images for updating steps

BUG 9749 - added better description of how users can get the CDK

BUG 9751 - re-arranged TOC to bring subjects under Overview

BUG 9750 - removed edition references

updated bugs fixed list and release notes

BUG 9740 - added missing description to table

BUG 9723 - Revised SBSv2 image and added description to table

BUG 9744 - updated versions in legal page

BUG 9748 - revised version number and link

additional checks to avoid swt exceptions when early finish wizard and proxy set incorrectly

revert commit to plugin.xml, was accidental commit

fix bug 9690, GCCErrorParser missing some errors from WINSCW builds

removed assert.

print java.home

fix some thread synchronization problems caused when proxy is incorrect

BUG 9705/9706 - Fixed broken TOC links to removed pages

Fix for bug 9652

removing an assert that always triggers when creating new projects

remove defaultEnablement org.eclipse.equinox.p2.ui.sdk.classicUpdate from cpp/plugin.xml for SYMSEE

fixed broken links in index and TOC

Bug 9676 - protect access of cahce object from dispose on separate thread

Disable sbsv2 compilation (turned on accidentally)

new API added to ICarbideProjectInfo

bug 9622, add agrs to sbsv2 command-line edit field

fix build config change listener - related to bug #9644.

fix build config change listener - related to bug #9644.

revert last two commits for bug 9642. A different fix is needed.

extra null check for fix from bug 9642

bug 9642. Apply drive spec of project for bitmaps defined with full path (i.e. /epoc32/....)

update from Symbian Foundation build team

Break out launch types from delegates

add category for P2 Update UI enablement through capabilities pref page + commented out extension for showing capabilities pref page

fix makmake error parser tests, add remainder of error parser tests missing from the builder full test suite.

Bug 9552 - enable classic update UI and disable the 2 p2 commands from the help menu using capabilities

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