Merge remote-tracking branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Sat, 22 Aug 2015 15:03:00 +0000 (17:03 +0200)
committerirengrig <Irina.Chernushina@jetbrains.com>
Sat, 22 Aug 2015 15:03:00 +0000 (17:03 +0200)
commit26222457b26248e21a9abbee2fc5b6c737c829a0
tree26a97a41df81e0b2ad73a6f1e0ff1c22f92a703c
parent9c77a1978fa935770299cb665f41d568b085cd3b
parenta6b6715b7636854b379f1af64373178a041b6192
Merge remote-tracking branch 'origin/master'
platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupConfigurable.java