Merge remote-tracking branch 'origin/master' into develar/is
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Thu, 21 Jul 2016 15:39:09 +0000 (17:39 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Thu, 21 Jul 2016 15:39:09 +0000 (17:39 +0200)
commite801fddb2395bebb868a0bec545ebe5845f3993d
treeee1f0b8bc8f0bdd100eaceefddc23127a85a9c46
parentc7e6dc98eed1bc3c6f961c071ed7a4a818390b26
parent99fd06c6af3f8e15ccdf1369305861f059e5c855
Merge remote-tracking branch 'origin/master' into develar/is
java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java
java/testFramework/src/com/intellij/testFramework/InspectionTestCase.java
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java