Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Fri, 2 Jul 2010 11:46:41 +0000 (15:46 +0400)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Fri, 2 Jul 2010 11:46:41 +0000 (15:46 +0400)
commit9cacc1b74f881d9bd86cab6cda81b3a5efbb251d
tree8c82ff0c6cc0c71f434b70904000110e78af4ae9
parent09f7db7007dc6c615412ee6f5eb383e41f73cb13
parentc320ac46a95d90a5b01cc0a27158e5e4b3fef629
Merge branch 'master' of git@git.labs.intellij.net:idea/community
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java