Merge remote-tracking branch 'origin/master'

This commit is contained in:
Dmitry Jemerov
2012-06-11 14:24:38 +02:00
@@ -168,7 +168,7 @@ public class SdkConfigurationUtil {
return sdk;
}
public static void setDirectoryProjectSdk(@NotNull final Project project, final Sdk sdk) {
public static void setDirectoryProjectSdk(@NotNull final Project project, @Nullable final Sdk sdk) {
ApplicationManager.getApplication().runWriteAction(new Runnable() {
public void run() {
ProjectRootManager.getInstance(project).setProjectSdk(sdk);