Merge branch 'merge_tool_dividers'
authorKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Tue, 17 Jul 2012 11:30:42 +0000 (15:30 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Tue, 17 Jul 2012 11:30:42 +0000 (15:30 +0400)
commit359b3f5419cd8dd23086254dd75c8ed58af545f1
treecce2dae837acd70e64cde0d7229a37632350e409
parentc0c9626c6ca927c6ff6323c326a3ba98a434a772
parent7870427927511f4417647e41c40a4c38485c4edf
Merge branch 'merge_tool_dividers'
platform/lang-impl/src/com/intellij/injected/editor/EditorWindow.java
platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/MergePanel2.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
platform/util/src/com/intellij/util/ui/UIUtil.java