# HG changeset patch
# User timkelly
# Date 1286824049 18000
# Node ID 66c78e9344604e0da02aa419064577d1ea2b08b4
# Parent  9799507aeaf2eb58ef0cd0f209a96104c422ee62# Parent  fdca363791810f987bcd8e44e34be488be5f3178
merge commit

diff -r fdca36379181 -r 66c78e934460 builder/com.nokia.carbide.cdt.builder.test/META-INF/MANIFEST.MF
--- a/builder/com.nokia.carbide.cdt.builder.test/META-INF/MANIFEST.MF	Mon Oct 11 13:51:15 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/META-INF/MANIFEST.MF	Mon Oct 11 14:07:29 2010 -0500
@@ -16,6 +16,7 @@
  com.nokia.carbide.cpp.epoc.engine,
  com.nokia.cpp.utils.core,
  org.jdom,
- org.eclipse.cdt.core
+ org.eclipse.cdt.core,
+ com.nokia.cpp.utils.ui;bundle-version="3.0.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: com.nokia.carbide.cdt.builder.test
diff -r fdca36379181 -r 66c78e934460 builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/AllTests.java
--- a/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/AllTests.java	Mon Oct 11 13:51:15 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/AllTests.java	Mon Oct 11 14:07:29 2010 -0500
@@ -39,6 +39,7 @@
 		suite.addTestSuite(TestCarbideProjectSettingsModifier.class);
 		suite.addTestSuite(TestEpocEngineHelper.class);
 		suite.addTestSuite(SBSv2QueryTests.class);
+		suite.addTestSuite(TestCreateGlobalPrefs.class);
 		
 		// error parser tests....
 		suite.addTestSuite(com.nokia.carbide.cdt.builder.test.errorParsers.TestMakmakeErrorParser.class);
diff -r fdca36379181 -r 66c78e934460 core/com.nokia.carbide.cpp.doc.user/html/concepts/images/breakpt_popup_menu.png