Merge remote-tracking branch 'origin/master' into develar/is
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Wed, 22 Jun 2016 12:40:12 +0000 (14:40 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Wed, 22 Jun 2016 12:40:12 +0000 (14:40 +0200)
commit38ae401c460bc8d371ef6bf7780bb39989d247a7
treea840e9801e628bd9c7736239cc2bfa2042b51869
parent551cedc5d531d672bff3164606cf2144cac77c45
parent85816de416363f6d8bda890881d826bdb9a24fb6
Merge remote-tracking branch 'origin/master' into develar/is

# Conflicts:
# java/java-tests/testSrc/com/intellij/codeInspection/OfflineInspectionResultViewTest.java
# platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfoType.java
# platform/lang-impl/src/com/intellij/codeInspection/actions/CodeCleanupAction.java
# platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionAction.java
23 files changed:
java/java-analysis-impl/src/com/intellij/codeInspection/visibility/AccessCanBeTightenedInspection.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.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/codeInsight/daemon/impl/HighlightInfoType.java
platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/SeverityRegistrar.java
platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionProfileWrapper.java
platform/analysis-impl/src/com/intellij/codeInspection/ex/ToolsImpl.java
platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java
platform/lang-impl/src/com/intellij/codeInspection/actions/CodeCleanupAction.java
platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionAction.java
platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java
platform/lang-impl/src/com/intellij/codeInspection/ui/DefaultInspectionToolPresentation.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java
platform/platform-resources/src/META-INF/LangExtensionPoints.xml
platform/platform-resources/src/META-INF/PlatformExtensions.xml
platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
plugins/InspectionGadgets/testsrc/com/intellij/codeInspection/visibility/AccessCanBeTightenedInspectionTest.java
python/src/com/jetbrains/python/inspections/PyPackageRequirementsInspection.java