Merge branch 'traff/open_or_attach'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 1 Oct 2018 15:58:47 +0000 (17:58 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 1 Oct 2018 15:58:47 +0000 (17:58 +0200)
commit65fe4a7d8979ee87412d0766687b6226e1028eed
tree018dfb7f6e1109bff73c14019c15c8d2182f00ba
parente8ad48be0d01d32f79a77484b2e1050973485c7f
parent24672d02e2584b267bdebd790af520d051c12e13
Merge branch 'traff/open_or_attach'
platform/platform-api/src/com/intellij/ide/GeneralSettings.java
platform/platform-impl/src/com/intellij/platform/PlatformProjectOpenProcessor.java
platform/platform-resources-en/src/messages/IdeBundle.properties