Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Jemerov <yole@jetbrains.com>
Fri, 26 Nov 2010 15:10:33 +0000 (18:10 +0300)
committerDmitry Jemerov <yole@jetbrains.com>
Fri, 26 Nov 2010 15:10:33 +0000 (18:10 +0300)
commitd93a5f8ebd63bfaa764564ef85e2041726398603
tree358958e836070262b7184be3a9f3c4767c61553a
parent4255eb1aa978908235d0a20dd96ebd69360bb2fc
parente11915dbd36c91c40a31c8ab9e958e993c20e6a4
Merge branch 'master' of git.labs.intellij.net:idea/community
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java