Merge remote-tracking branch 'origin/master' into eldar/cidr-debugger

# Conflicts:
#	CIDR/clion/src/com/jetbrains/cidr/cpp/toolchains/MSVC.java

GitOrigin-RevId: f3593b526d1870f32b3f1451cab0c6a653e5beb5
This commit is contained in:
Eldar Abusalimov
2019-06-16 03:01:38 +03:00
committed by intellij-monorepo-bot
parent c9c165702a
commit 1120c30a56
2631 changed files with 13602 additions and 189219 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>