Merge remote-tracking branch 'origin/master' into develar/is
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Tue, 28 Jun 2016 14:00:01 +0000 (16:00 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Tue, 28 Jun 2016 14:00:01 +0000 (16:00 +0200)
commit178bc4950b519e41ce1e0d83abd8ed37c4bf7c5c
tree9d8ed40e489f41097975b3304b79178c388f0d7c
parent85b7dcb8e37774998f816323b9de97cd68acba1d
parente42f1e964f8c37d9c4d8fcafa3ac49dadb4952b5
Merge remote-tracking branch 'origin/master' into develar/is
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/PostHighlightingVisitor.java
java/java-tests/testSrc/com/intellij/codeInspection/ex/InspectionProfileTest.java
platform/lang-impl/src/com/intellij/codeInspection/InspectionApplication.java
platform/platform-resources/src/META-INF/LangExtensionPoints.xml
platform/util/resources/misc/registry.properties
python/src/com/jetbrains/python/inspections/PyPackageRequirementsInspection.java
xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java