Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Mon, 9 Aug 2010 15:27:35 +0000 (19:27 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Mon, 9 Aug 2010 15:27:35 +0000 (19:27 +0400)
commit55ec05c497f678ca2b75d56a7d082e6350dcd542
tree9d52a681b0cd9946cd2ea76628dfaf7fd93462ac
parent4f4cfd42a4b8521be24764c48c8097286d65735f
parent1994a3eaf9e4a25f0ccd9e6860839a65cb736553
Merge branch 'master' of git.labs.intellij.net:idea/community
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java