Merge commit 'a85b798667f6a81500b21eda3c8d508a28cb969c' into slava/out_of_process_sim_and_dev

GitOrigin-RevId: ccfc7bb2ab1846fbf2c169f6262ffa412f3efb80
This commit is contained in:
Vyacheslav Karpukhin
2019-06-13 03:32:21 +03:00
committed by intellij-monorepo-bot
parent 7afa5ca0ac
commit e4effb75b9
278 changed files with 2439 additions and 3773 deletions
-1
View File
@@ -62,7 +62,6 @@
<orderEntry type="library" name="javax.activation" level="project" />
<orderEntry type="library" scope="RUNTIME" name="jaxb-runtime" level="project" />
<orderEntry type="module" module-name="intellij.platform.objectSerializer.annotations" />
<orderEntry type="module" module-name="intellij.platform.externalSystem.impl" />
</component>
<component name="copyright">
<Base>