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

author	Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
	Tue, 12 Jul 2016 14:04:34 +0000 (16:04 +0200)
committer	Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
	Tue, 12 Jul 2016 14:04:34 +0000 (16:04 +0200)
commit	a4e6a4d598877aeb055874a82da04f627aa1e64a
tree	b3e01471c5d524243934390a0432d86aaca11abc	tree
parent	367d3705af06bd57ad0662822c32f86640d7bb62	commit \| diff
parent	b7c079b643585f21257ef3dea70abb47c9fc3ee2	commit \| diff

Merge remote-tracking branch 'origin/master' into develar/is

# Conflicts:
# platform/configuration-store-impl/src/StateStorageManagerImpl.kt

IntelliJ IDEA Community Edition and IntelliJ Platform.

java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java	diff1 \|	diff2 \|	blob \| history
platform/configuration-store-impl/src/StateStorageManagerImpl.kt	diff1 \|	diff2 \|	blob \| history
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionNodeInfo.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/openapi/fileEditor/impl/FileDocumentManagerImpl.java	diff1 \|	diff2 \|	blob \| history
platform/util/resources/misc/registry.properties	diff1 \|	diff2 \|	blob \| history