# HG changeset patch
# User fturovic <frank.turovich@nokia.com>
# Date 1245877435 18000
# Node ID ba1cc22feee332ed2012cb70b1c435dcb02765c1
# Parent  8ad872e05db49fe6814e512814483ab5fedf4491# Parent  192fda8b2d77a1e11d858597bc2ac57117ca9a90
merge

diff -r 8ad872e05db4 -r ba1cc22feee3 core/com.nokia.carbide.cpp.sdk.core.test/src/com/nokia/carbide/cpp/sdk/core/test/SymbianContextTest.java
--- a/core/com.nokia.carbide.cpp.sdk.core.test/src/com/nokia/carbide/cpp/sdk/core/test/SymbianContextTest.java	Wed Jun 24 15:56:42 2009 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core.test/src/com/nokia/carbide/cpp/sdk/core/test/SymbianContextTest.java	Wed Jun 24 16:03:55 2009 -0500
@@ -49,7 +49,7 @@
 		assertNotNull(sdkList);
 		assertTrue(sdkList.size() > 0);
 		
-		ISymbianSDK sdk = SDKCorePlugin.getSDKManager().getSDK("S60_3rd_MR", true);
+		ISymbianSDK sdk = SDKCorePlugin.getSDKManager().getSDK("S60_5th_Edition_SDK_v1.0", true);
 		assertNotNull("SDK should exist for test", sdk);
 		SymbianBuildContext context = new SymbianBuildContext(sdk, "WINSCW", "UDEB");
 		ISymbianSDK contextSDK = context.getSDK();