Merge remote-tracking branch 'origin/master' into amakeev/gradle

GitOrigin-RevId: f9a633252daf311ecab19002c0f4757052eee9dc
This commit is contained in:
Anton Makeev
2019-05-17 19:13:15 +03:00
committed by intellij-monorepo-bot
parent 47bb3d8475
commit c105e26db3
1938 changed files with 71469 additions and 5103 deletions
+1
View File
@@ -61,6 +61,7 @@
<orderEntry type="library" name="jaxb-api" level="project" />
<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" />
</component>
<component name="copyright">
<Base>