# HG changeset patch
# User cawthron
# Date 1240682050 18000
# Node ID c937102a551076fa2d6d689ae977fd03b7f82f7d
# Parent  37df159d7f81d7e4bd2e0e39093965ef304f3c9d# Parent  efa1c6e4825e7476e64dc063fd24a6280969c2d9
merge heads from Austin sync

diff -r efa1c6e4825e -r c937102a5510 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/kb/CSKbManager.java
diff -r efa1c6e4825e -r c937102a5510 core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/CustomAboutDialog.java
diff -r efa1c6e4825e -r c937102a5510 core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/ProductPlugin.java
diff -r efa1c6e4825e -r c937102a5510 core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/ProductStartup.java
diff -r efa1c6e4825e -r c937102a5510 core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/actions/DisplayReleaseNotesAction.java
diff -r efa1c6e4825e -r c937102a5510 core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/logging/DiagnosticLog.java
diff -r efa1c6e4825e -r c937102a5510 core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/logging/DiagnosticLogGroup.java
diff -r efa1c6e4825e -r c937102a5510 core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/logging/DiagnosticLogManager.java
diff -r efa1c6e4825e -r c937102a5510 core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/logging/LoggingPreferencesPage.java
diff -r efa1c6e4825e -r c937102a5510 core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/preferences/ExtensionsPreferencesPage.java
diff -r efa1c6e4825e -r c937102a5510 debuggercdi/com.nokia.carbide.trk.support/Native/GetTRKVersion/TestGetTRKVersion/TestGetTRKVersion.cpp
diff -r efa1c6e4825e -r c937102a5510 debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/connection/TCPIPConnectionFactory.java
diff -r efa1c6e4825e -r c937102a5510 debuggercdi/com.nokia.cdt.debug.cw.symbian.tests/src/com/nokia/cdt/debug/cw/symbian/tests/AllTests.java
diff -r efa1c6e4825e -r c937102a5510 debuggercdi/com.nokia.cdt.debug.cw.symbian.tests/src/com/nokia/cdt/debug/cw/symbian/tests/DwarfReaderTest.java
diff -r efa1c6e4825e -r c937102a5510 debuggercdi/com.nokia.cdt.debug.cw.symbian.tests/src/com/nokia/cdt/debug/cw/symbian/tests/SymbianE32ParserTest.java
diff -r efa1c6e4825e -r c937102a5510 debuggercdi/com.nokia.cdt.debug.cw.symbian.tests/src/com/nokia/cdt/debug/cw/symbian/tests/SymbolReaderTest.java
diff -r efa1c6e4825e -r c937102a5510 debuggercdi/com.nokia.cdt.debug.cw.symbian.tests/src/com/nokia/cdt/debug/cw/symbian/tests/TestsPlugin.java
diff -r efa1c6e4825e -r c937102a5510 project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/images/providers/ThumbnailImageModelLabelProvider.java
diff -r efa1c6e4825e -r c937102a5510 uidesigner/com.nokia.carbide.cpp.uiq.ui-feature/build.properties
diff -r efa1c6e4825e -r c937102a5510 uidesigner/com.nokia.carbide.cpp.uiq.ui-feature/feature.xml
diff -r efa1c6e4825e -r c937102a5510 uidesigner/com.nokia.sdt.uidesigner-feature/build.properties
diff -r efa1c6e4825e -r c937102a5510 uidesigner/com.nokia.sdt.uidesigner-feature/feature.xml