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)
commit91d36ff888c318ecdd7d2a99501c2a994f576371
tree1a26612e84a84b6190beec7b08585237b9197096
parent00bfd00060330543907d2e862679fe29a726a03b
parent8ac9dcc94d1c4bd99153715fd1692e0caafea616
Merge branch 'master' of git@git.labs.intellij.net:idea/community
platform/platform-impl/src/com/intellij/codeInsight/hint/HintManagerImpl.java
platform/platform-impl/src/com/intellij/ui/BalloonImpl.java