Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Wed, 15 Dec 2010 15:32:40 +0000 (18:32 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Wed, 15 Dec 2010 15:32:40 +0000 (18:32 +0300)
1  2 
platform/platform-impl/src/com/intellij/codeInsight/hint/HintManagerImpl.java
platform/platform-impl/src/com/intellij/ui/BalloonImpl.java