Merge branch 'master' into uta/rainbow
authorAlexey Utkin <alexey.utkin@jetbrains.com>
Thu, 11 Aug 2016 12:01:33 +0000 (15:01 +0300)
committerAlexey Utkin <alexey.utkin@jetbrains.com>
Thu, 11 Aug 2016 12:01:33 +0000 (15:01 +0300)
commit5eda561006e5f6c696214569bd78a6b095fc674a
tree9469fb3db643cd73d9f2602d62c38efd54b72a1d
parentadfb17a88265d2e4f68bd0176d372996532aeb12
parent54d4e872158cb50742c65f253dcce0aeb3f184ae
Merge branch 'master' into uta/rainbow

# Conflicts:
# platform/analysis-impl/src/com/intellij/codeInsight/daemon/RainbowVisitor.java
# platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java
# platform/lang-impl/src/com/intellij/application/options/colors/SimpleEditorPreview.java
java/java-impl/src/com/intellij/openapi/options/colors/pages/JavaColorSettingsPage.java
platform/analysis-impl/src/com/intellij/codeHighlighting/RainbowHighlighter.java
platform/analysis-impl/src/com/intellij/codeInsight/daemon/RainbowVisitor.java
platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java
platform/lang-impl/src/com/intellij/application/options/colors/ColorOptionsTree.java
platform/lang-impl/src/com/intellij/application/options/colors/ColorSettingsUtil.java
platform/lang-impl/src/com/intellij/application/options/colors/NewColorAndFontPanel.java
platform/lang-impl/src/com/intellij/application/options/colors/OptionsPanelImpl.java
platform/lang-impl/src/com/intellij/application/options/colors/SchemesPanel.java
platform/lang-impl/src/com/intellij/application/options/colors/SimpleEditorPreview.java
platform/lang-impl/src/com/intellij/openapi/options/colors/pages/DefaultLanguageColorsPage.java