Merge branch 'master' of git@git.labs.intellij.net:idea/community

author Kirill Kalishev <kirill.kalishev@jetbrains.com>

Wed, 15 Dec 2010 15:32:40 +0000 (18:32 +0300)

committer Kirill Kalishev <kirill.kalishev@jetbrains.com>

Wed, 15 Dec 2010 15:32:40 +0000 (18:32 +0300)
author Kirill Kalishev <kirill.kalishev@jetbrains.com>
Wed, 15 Dec 2010 15:32:40 +0000 (18:32 +0300)
committer Kirill Kalishev <kirill.kalishev@jetbrains.com>
Wed, 15 Dec 2010 15:32:40 +0000 (18:32 +0300)
diff --cc platform/platform-impl/src/com/intellij/codeInsight/hint/HintManagerImpl.java
Simple merge
diff --cc platform/platform-impl/src/com/intellij/ui/BalloonImpl.java
Simple merge
author	Kirill Kalishev <kirill.kalishev@jetbrains.com>
	Wed, 15 Dec 2010 15:32:40 +0000 (18:32 +0300)
committer	Kirill 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	patch \|	diff1 \|	diff2 \|	blob \| history
platform/platform-impl/src/com/intellij/ui/BalloonImpl.java	patch \|	diff1 \|	diff2 \|	blob \| history