Merge branch 'da/dumb_run'
authorDmitry Avdeev <dmitry.avdeev@jetbrains.com>
Wed, 23 Aug 2017 15:34:29 +0000 (18:34 +0300)
committerDmitry Avdeev <dmitry.avdeev@jetbrains.com>
Wed, 23 Aug 2017 15:34:29 +0000 (18:34 +0300)
commit7aed4230c215d43cb7504f445e848f14abe2adec
treec3059ab4259a27b5baef3ec99dd98dfe4dd78b1b
parent788ab3c5e292b4f1ea0ec3f26c48ac5203acfe9b
parentf71966583ba941be46c17ed4ce53236e8ba31f0e
Merge branch 'da/dumb_run'

# Conflicts:
# platform/lang-api/src/com/intellij/execution/configurations/ConfigurationType.java
# platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java
# platform/smRunner/src/com/intellij/execution/testframework/sm/SMTestRunnerConnectionUtil.java
# platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTestProxy.java
platform/lang-api/src/com/intellij/execution/configurations/ConfigurationType.java
platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java
platform/lang-impl/src/com/intellij/execution/RunContentExecutor.java
platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java
platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.kt
platform/smRunner/src/com/intellij/execution/testframework/sm/SMTestRunnerConnectionUtil.java
platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTestProxy.java
platform/util/resources/misc/registry.properties