Merge remote-tracking branch 'origin/master' into develar/is
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Mon, 18 Jul 2016 09:22:38 +0000 (11:22 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Mon, 18 Jul 2016 09:22:38 +0000 (11:22 +0200)
commit5843e7012b1ca0b403ff61c4e9869339eca0a3f2
tree56acd36a62f7cdee3938dafe825034edb1c3b161
parent61a78e8423152de81ad07063b1935b4b26742b6b
parent3f02ba52455b9ee76b7559daf5bccdf48c52ed34
Merge remote-tracking branch 'origin/master' into develar/is

# Conflicts:
# platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
# platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
java/java-analysis-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerBase.java
java/testFramework/src/com/intellij/testFramework/InspectionTestCase.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/execution/ui/RunContentManagerImpl.java
platform/platform-resources/src/META-INF/LangExtensionPoints.xml
platform/testFramework/src/com/intellij/testFramework/InspectionTestUtil.java
platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
platform/util/resources/misc/registry.properties