Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Mon, 18 Jul 2016 12:18:12 +0000 (14:18 +0200)
committerKonstantin Bulenkov <kb@jetbrains.com>
Mon, 18 Jul 2016 12:18:12 +0000 (14:18 +0200)
commitf8e35eab0ebda12ff993bbc45327680e8e565890
tree880ad86851ee4f5e98f506baf261995ea80148f1
parent127db3831eb0db0a12b7257092aa3fe445376e9d
parent294941ab2ed0d1d3f3ee54a8d51d3130fa51d239
Merge remote-tracking branch 'origin/master'
platform/analysis-impl/src/com/intellij/codeHighlighting/RainbowHighlighter.java