Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anna Kozlova
2014-02-18 15:06:41 +04:00
@@ -126,6 +126,7 @@ public class PyActiveSdkConfigurable implements UnnamedConfigurable {
myDetailsButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
myMainPanel.grabFocus();
PythonSdkDetailsStep
.show(myProject, myProjectSdksModel.getSdks(),
myModule == null ? new PythonSdkDetailsDialog(myProject, myDetailsCallback) :