Merge branch 'master' into uta/rainbow
authorAlexey Utkin <alexey.utkin@jetbrains.com>
Wed, 24 Aug 2016 10:06:19 +0000 (13:06 +0300)
committerAlexey Utkin <alexey.utkin@jetbrains.com>
Wed, 24 Aug 2016 10:06:19 +0000 (13:06 +0300)
commitfd654fdb4f3c5b6ba93d406d014666dc4d4c50e9
tree9d9b2eb24ce5120b72c976c663597b83bc183712
parent0cacb8e9dd7aedabda872800b2f1ab00722d8e71
parent03a35a3f0aaca4c5e49552ee741d34d376522606
Merge branch 'master' into uta/rainbow
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightNamesUtil.java
java/java-impl/src/com/intellij/openapi/options/colors/pages/JavaColorSettingsPage.java
platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java