Merge branch 'master' into uta/rainbow
authorAlexey Utkin <alexey.utkin@jetbrains.com>
Fri, 19 Aug 2016 19:03:34 +0000 (22:03 +0300)
committerAlexey Utkin <alexey.utkin@jetbrains.com>
Fri, 19 Aug 2016 19:03:34 +0000 (22:03 +0300)
commit392dfe25bee002ca54a4b210483d24a556510e80
tree5877bd5ecaff8805b3abd8644efca90c37a3d902
parent2182ee66db47d1074cd88e7903d9ff8a9bfc72e1
parent5eed3f8b14148961f66b3da6f81c630b801d3585
Merge branch 'master' into uta/rainbow

# Conflicts:
# platform/analysis-impl/src/com/intellij/codeHighlighting/RainbowHighlighter.java
# platform/analysis-impl/src/com/intellij/codeInsight/daemon/RainbowVisitor.java
platform/analysis-impl/src/com/intellij/codeHighlighting/RainbowHighlighter.java