Merge remote-tracking branch 'origin/master' into develar/is
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Tue, 19 Jul 2016 09:37:07 +0000 (11:37 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Tue, 19 Jul 2016 09:37:07 +0000 (11:37 +0200)
commit9ae694f9a809a00030395f64f93134f09278d8c3
tree81e40b430bafb69bdca5a6998279030de4b8812d
parent637c7b4820a05be31c082f58aef38b2e2dd869c1
parent3f7b89e37c420ac4baef66107bfc182c801eee1d
Merge remote-tracking branch 'origin/master' into develar/is

# Conflicts:
# lib/annotations/jdk/java/nio/file/annotations.xml
# platform/configuration-store-impl/src/SchemeManagerImpl.kt
# platform/configuration-store-impl/testSrc/SchemeManagerTest.kt
platform/configuration-store-impl/src/SchemeManagerImpl.kt
platform/configuration-store-impl/testSrc/SchemeManagerTest.kt
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/header/InspectionToolsConfigurable.java
platform/platform-impl/src/com/intellij/util/path.kt
platform/platform-resources/src/META-INF/LangExtensionPoints.xml
plugins/settings-repository/testSrc/IcsTestCase.kt