Merge branch 'slava/plugin-incompatible-with'
authorVyacheslav Karpukhin <Vyacheslav.Karpukhin@jetbrains.com>
Tue, 12 May 2020 18:09:41 +0000 (20:09 +0200)
committerintellij-monorepo-bot <intellij-monorepo-bot-no-reply@jetbrains.com>
Tue, 12 May 2020 18:09:41 +0000 (18:09 +0000)
commit0a8af6e1f6e6908e4578c357c2994494cdf3dbb6
treeec9010dda4a1ee7c24bec810aeb76fe9c355f967
parenta379c7def179a167ade372df6bebcefc45937348
parent61114568e79828f21e9bfb71aa6bb19f5ab94c4d
Merge branch 'slava/plugin-incompatible-with'

# Conflicts:
# community/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java
# community/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
# community/platform/extensions/src/com/intellij/openapi/extensions/PluginDescriptor.java
# community/platform/platform-tests/testData/plugins/sort/simplePluginSort.txt

GitOrigin-RevId: 4ad7f001037c5c3c30e3f185971d3075702bfc41
platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java
platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
platform/extensions/src/com/intellij/openapi/extensions/DefaultPluginDescriptor.java
platform/extensions/src/com/intellij/openapi/extensions/PluginDescriptor.java
platform/platform-impl/src/com/intellij/ide/plugins/PluginNode.java
platform/platform-tests/testData/plugins/sort/simplePluginSort.txt
platform/platform-tests/testData/plugins/sort/simplePluginSort.xml