Merge branch 'master' of https://github.com/dahlstrom-g/intellij-community into dahls...
authorpeter <peter@jetbrains.com>
Wed, 3 Aug 2016 11:55:20 +0000 (13:55 +0200)
committerpeter <peter@jetbrains.com>
Wed, 3 Aug 2016 11:55:20 +0000 (13:55 +0200)
commitbba886e795249cee941357ec3404125695a14dca
treedf1df01c403c7de0bc5c56d97ffa157ebf580f8b
parent9932a4ddca808450abea626016810383fad8b91e
parent77476742420c02fe890ea691402bb09db96693a7
Merge branch 'master' of https://github.com/dahlstrom-g/intellij-community into dahlstrom-g-master
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/HardcodedContracts.java
java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java