Merge branch 'master' into daywalker/cmake_editing clion/146.1019 clion/146.1104 clion/146.960
authorVasily Pisar <vasily.pisar@jetbrains.com>
Wed, 30 Mar 2016 18:01:34 +0000 (21:01 +0300)
committerVasily Pisar <vasily.pisar@jetbrains.com>
Wed, 30 Mar 2016 18:01:34 +0000 (21:01 +0300)
commit0a0bf0a1be31f694844309d4735d6aee50c1d71b
tree3ed803c2aa990b890468474a8d71f33bfd601ecd
parentca907554a6b2a6667ee7bd34ea7381470ac7b217
parent77b5d5469c76bdfa76445ac1ffd72a0e6a1baf6a
Merge branch 'master' into daywalker/cmake_editing
platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java