merge heads from Austin sync
authorcawthron
Sat, 25 Apr 2009 12:54:10 -0500
changeset 127 c937102a5510
parent 1 37df159d7f81 (diff)
parent 126 efa1c6e4825e (current diff)
child 128 c028612cc555
merge heads from Austin sync
core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/kb/CSKbManager.java
core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/CustomAboutDialog.java
core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/ProductPlugin.java
core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/ProductStartup.java
core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/actions/DisplayReleaseNotesAction.java
core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/logging/DiagnosticLog.java
core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/logging/DiagnosticLogGroup.java
core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/logging/DiagnosticLogManager.java
core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/logging/LoggingPreferencesPage.java
core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/preferences/ExtensionsPreferencesPage.java
debuggercdi/com.nokia.carbide.trk.support/Native/GetTRKVersion/TestGetTRKVersion/TestGetTRKVersion.cpp
debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/connection/TCPIPConnectionFactory.java
debuggercdi/com.nokia.cdt.debug.cw.symbian.tests/src/com/nokia/cdt/debug/cw/symbian/tests/AllTests.java
debuggercdi/com.nokia.cdt.debug.cw.symbian.tests/src/com/nokia/cdt/debug/cw/symbian/tests/DwarfReaderTest.java
debuggercdi/com.nokia.cdt.debug.cw.symbian.tests/src/com/nokia/cdt/debug/cw/symbian/tests/SymbianE32ParserTest.java
debuggercdi/com.nokia.cdt.debug.cw.symbian.tests/src/com/nokia/cdt/debug/cw/symbian/tests/SymbolReaderTest.java
debuggercdi/com.nokia.cdt.debug.cw.symbian.tests/src/com/nokia/cdt/debug/cw/symbian/tests/TestsPlugin.java
project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/images/providers/ThumbnailImageModelLabelProvider.java
uidesigner/com.nokia.carbide.cpp.uiq.ui-feature/build.properties
uidesigner/com.nokia.carbide.cpp.uiq.ui-feature/feature.xml
uidesigner/com.nokia.sdt.uidesigner-feature/build.properties
uidesigner/com.nokia.sdt.uidesigner-feature/feature.xml