Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Fri, 19 Apr 2013 15:08:12 +0000 (19:08 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Fri, 19 Apr 2013 15:08:12 +0000 (19:08 +0400)
1  2 
platform/lang-api/src/com/intellij/codeInsight/PsiEquivalenceUtil.java
platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoComponent.java