Merge remote-tracking branch 'origin/master' into develar/is
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Tue, 19 Jul 2016 11:56:04 +0000 (13:56 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Tue, 19 Jul 2016 11:56:04 +0000 (13:56 +0200)
commit47225b8aeed62669a1e1fba496b518778e913b61
tree0608c74a5853db4d373e358088dcf8d1cdcf32ad
parent7660f193c07632b017e43d88250184b545e1f169
parent88e2960b440103d40f46c6cc2e8d3de3c686d7d3
Merge remote-tracking branch 'origin/master' into develar/is
java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java
java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java
java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java
platform/util/resources/misc/registry.properties