Merge remote-tracking branch 'origin/master' into develar/is
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Thu, 21 Jul 2016 08:28:34 +0000 (10:28 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Thu, 21 Jul 2016 08:28:34 +0000 (10:28 +0200)
commite7648dff0cd2a2c7c981260df8343f6555596f32
tree8b4b969341e91255e19fa54cd4c2b6e56c27cf6a
parent36fe649f01b0eeb9a2ec86814a20ce8b822fe7d1
parente1d4d1acc4cc1545a6d7f3508d7a413a6aa6a0f7
Merge remote-tracking branch 'origin/master' into develar/is
java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java
java/java-tests/testSrc/com/intellij/codeInspection/ex/InspectionProfileTest.java
platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java