# HG changeset patch
# User Ed Swartz <ed.swartz@nokia.com>
# Date 1272391862 18000
# Node ID e195ff3f43bf8c6e95199e1f610dc28e3daa0845
# Parent  a672cbed30148afa80b30f3d2913ca2f6f9fd89a# Parent  012040f34296f3d18dd1b08b92a555b1bf8b2097
Merge commit

diff -r a672cbed3014 -r e195ff3f43bf core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/sdk/ui/shared/BuildTargetsPage.java
--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/sdk/ui/shared/BuildTargetsPage.java	Tue Apr 27 13:09:37 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/sdk/ui/shared/BuildTargetsPage.java	Tue Apr 27 13:11:02 2010 -0500
@@ -226,6 +226,8 @@
         });
 		filterCheckbox.setData(UID, "filterCheckbox"); //$NON-NLS-1$
 
+		addOtherControls(parent);
+		
 		Link fLink = new Link(parent, SWT.WRAP);
 		fLink.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		fLink.setText(Messages.getString("BuildTargetsPage.Select_Filtering_Prefs_Link")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -248,8 +250,6 @@
 
 		});
 		
-		addOtherControls(parent);
-		
 		setPageComplete(validatePage());
 	}