Merge remote-tracking branch 'origin/master' into develar/is
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 1 Jul 2016 11:12:59 +0000 (13:12 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 1 Jul 2016 11:12:59 +0000 (13:12 +0200)
commitb548de324767d79ce412aac7a7b8ee715f5a661c
treeb38c5116df0a00e06651fcc32592333643236ee1
parent224064427a8a76517843c785e02c028cd491aa53
parente62da1016d63ed41ba83751a70fd688318395e64
Merge remote-tracking branch 'origin/master' into develar/is

# Conflicts:
# platform/lang-impl/src/com/intellij/codeInspection/actions/ViewOfflineResultsAction.java
13 files changed:
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/PostHighlightingVisitor.java
java/java-analysis-impl/src/com/intellij/codeInspection/visibility/AccessCanBeTightenedInspection.java
java/java-tests/testSrc/com/intellij/codeInspection/OfflineInspectionResultViewTest.java
platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java
platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java
platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionAction.java
platform/lang-impl/src/com/intellij/codeInspection/actions/ViewOfflineResultsAction.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
platform/platform-impl/src/com/intellij/util/path.kt
platform/platform-resources/src/META-INF/LangExtensionPoints.xml
platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
platform/util/resources/misc/registry.properties
plugins/InspectionGadgets/testsrc/com/intellij/codeInspection/visibility/AccessCanBeTightenedInspectionTest.java