git.jetbrains.org - idea/community.git/commit

projects / idea / community.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2240644 e62da10)

author	Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
	Fri, 1 Jul 2016 11:12:59 +0000 (13:12 +0200)
committer	Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
	Fri, 1 Jul 2016 11:12:59 +0000 (13:12 +0200)
commit	b548de324767d79ce412aac7a7b8ee715f5a661c
tree	b38c5116df0a00e06651fcc32592333643236ee1	tree
parent	224064427a8a76517843c785e02c028cd491aa53	commit \| diff
parent	e62da1016d63ed41ba83751a70fd688318395e64	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
java/java-analysis-impl/src/com/intellij/codeInspection/visibility/AccessCanBeTightenedInspection.java	diff1 \|	diff2 \|	blob \| history
java/java-tests/testSrc/com/intellij/codeInspection/OfflineInspectionResultViewTest.java	diff1 \|	diff2 \|	blob \| history
platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java	diff1 \|	diff2 \|	blob \| history
platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java	diff1 \|	diff2 \|	blob \| history
platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionAction.java	diff1 \|	diff2 \|	blob \| history
platform/lang-impl/src/com/intellij/codeInspection/actions/ViewOfflineResultsAction.java	diff1 \|	diff2 \|	blob \| history
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java	diff1 \|	diff2 \|	blob \| history
platform/platform-impl/src/com/intellij/util/path.kt	diff1 \|	diff2 \|	blob \| history
platform/platform-resources/src/META-INF/LangExtensionPoints.xml	diff1 \|	diff2 \|	blob \| history
platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java	diff1 \|	diff2 \|	blob \| history
platform/util/resources/misc/registry.properties	diff1 \|	diff2 \|	blob \| history
plugins/InspectionGadgets/testsrc/com/intellij/codeInspection/visibility/AccessCanBeTightenedInspectionTest.java	diff1 \|	diff2 \|	blob \| history

IntelliJ IDEA Community Edition and IntelliJ Platform.