Merge remote-tracking branch 'origin/master' into develar/is
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Wed, 20 Jul 2016 09:14:43 +0000 (11:14 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Wed, 20 Jul 2016 09:14:43 +0000 (11:14 +0200)
commit7958abe07ab449b06af7a3ac75ffbb9488c7155a
tree996927637508e5bcd9a593fb4a36ef2ff3050a4d
parent4ab9c06089e291039d2f347c6dce46c1637f6171
parent83e579c574d191702109a729456761d968ff7b39
Merge remote-tracking branch 'origin/master' into develar/is

# Conflicts:
# platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionProfileImpl.java
java/java-tests/testSrc/com/intellij/codeInspection/ex/InspectionProfileTest.java
platform/analysis-api/src/com/intellij/codeInspection/InspectionProfileEntry.java
platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java
platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionProfileImpl.java
platform/configuration-store-impl/src/ExportSettingsAction.kt
xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java