Merge branch 'master' of git.labs.intellij.net:idea/community
authorVasily Romanikhin <vasily.romanikhin@jetbrains.com>
Fri, 3 Jun 2016 12:53:11 +0000 (15:53 +0300)
committerVasily Romanikhin <vasily.romanikhin@jetbrains.com>
Fri, 3 Jun 2016 12:53:11 +0000 (15:53 +0300)
commit60d108da36ba79febf886200ee9af24ece9fc654
tree7eefb511b76e4c0ed579858fe70b58aa32e54003
parent4df0981c5a4d73ced290b39d8dcf8c83c3422795
parent97237d8ee7abaaca1184753200a72a4f39a5b3fa
Merge branch 'master' of git.labs.intellij.net:idea/community
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/InjectedGeneralHighlightingPass.java