Merge remote-tracking branch 'origin/master' into develar/is
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Mon, 18 Jul 2016 11:58:00 +0000 (13:58 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Mon, 18 Jul 2016 11:58:00 +0000 (13:58 +0200)
commit1381b541b0bad97e15302309d3eaf7740a396c59
tree6bd3ee6d3879d9f49272bf0c0c0d44d8163ed143
parentb3a13b76b1733b9c613a111906bd8f52e42e1cdf
parentb39787a164a7b6c8e99b0f2062d0db13f34c0051
Merge remote-tracking branch 'origin/master' into develar/is
java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java
platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java
platform/configuration-store-impl/src/FileBasedStorage.kt
platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java