# HG changeset patch
# User Ed Swartz <ed.swartz@nokia.com>
# Date 1264693619 21600
# Node ID 381d143dacc3cbc54e5564fce7b87fa45713aff3
# Parent  eb9903eb53520e1dcdb4574aac87e0d9a59b5edf# Parent  565becd9a91eeced63ed690e05d56fa8e9ac851e
Merge commit

diff -r eb9903eb5352 -r 381d143dacc3 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java	Thu Jan 28 09:46:46 2010 -0600
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java	Thu Jan 28 09:46:59 2010 -0600
@@ -2451,7 +2451,7 @@
 		final IPreferenceStore prefsStore = CarbideBuilderPlugin.getDefault().getPreferenceStore();
 		
 		if (prefsStore.getBoolean(BuilderPreferenceConstants.PREF_DONT_PROMPT_FOR_DEPENDENCY_MISMATCH) == false &&
-				areWeManagingTheMakeFiles && !makeFileHasOurChanges(makefile)) {
+				areWeManagingTheMakeFiles && !makeFileHasOurChanges(makefile) && !WorkbenchUtils.isJUnitRunning()) {
 			
 			// if they are not then the user must have been building from the command line.  this means that
 			// any dependency files that exist could be stale so we need to delete them.  we also need to
diff -r eb9903eb5352 -r 381d143dacc3 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/CarbideMainTab.java
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/CarbideMainTab.java	Thu Jan 28 09:46:46 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/CarbideMainTab.java	Thu Jan 28 09:46:59 2010 -0600
@@ -89,11 +89,12 @@
 	}
 
 	@Override
-	public void createControl(Composite parent) {
-		super.createControl(parent);
+	public void createBuildOptionGroup(final Composite parent, int colSpan){
+		super.createBuildOptionGroup(parent, colSpan);
 		fEnableBuildButton.setData(".uid", "CMainTab.EnableBuildButton"); //$NON-NLS-1$ //$NON-NLS-2$
 		fDisableBuildButton.setData(".uid", "CMainTab.DisableBuildButton"); //$NON-NLS-1$ //$NON-NLS-2$
 		fWorkspaceSettingsButton.setData(".uid", "CMainTab.WorkspaceSettingsButton"); //$NON-NLS-1$ //$NON-NLS-2$ 
 		fWorkpsaceSettingsLink.setData(".uid", "CMainTab.WorkspaceSettingsLink"); //$NON-NLS-1$ //$NON-NLS-2$
+		
 	}
 }
\ No newline at end of file