Merge remote-tracking branch 'origin/master' into eldar/async-execution-coroutines
authorEldar Abusalimov <eldar.abusalimov@jetbrains.com>
Thu, 16 Aug 2018 01:46:38 +0000 (04:46 +0300)
committerEldar Abusalimov <eldar.abusalimov@jetbrains.com>
Thu, 16 Aug 2018 01:46:38 +0000 (04:46 +0300)
# Conflicts:
# platform/platform-impl/src/com/intellij/openapi/application/impl/AppUIExecutorImpl.java

1  2 
platform/platform-impl/intellij.platform.ide.impl.iml

index c0caafd4c93ef4ea292d5b219ab648f2eede65a4,fc379c5de11dcdcafb2d46de68f5c6b4c1c2e9b8..ec65331192f45ba171251ad7612118d1bdde695d
@@@ -48,9 -48,9 +48,9 @@@
      <orderEntry type="library" exported="" name="StreamEx" level="project" />
      <orderEntry type="library" name="jediterm-pty" level="project" />
      <orderEntry type="module" module-name="intellij.platform.tasks.impl" scope="RUNTIME" />
 -    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
 +    <orderEntry type="library" exported="" name="kotlinx-coroutines-core" level="project" />
      <orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
-     <orderEntry type="library" name="org.apache.httpcomponents:fluent-hc" level="project" />
+     <orderEntry type="library" name="fluent-hc" level="project" />
      <orderEntry type="library" name="netty-codec-http" level="project" />
      <orderEntry type="library" name="netty-handler" level="project" />
      <orderEntry type="library" scope="RUNTIME" name="error-prone-annotations" level="project" />