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)
1  2 
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

index b2daffd4989a9a119f39f578b594a368d307bae0,44d0195afef9d9cbd37e8af8367a951e65116f59..219c3f9e0e7afb01bf5988b870194584435f4a7e
@@@ -49,10 -50,7 +50,8 @@@ import com.intellij.openapi.project.Pro
  import com.intellij.openapi.ui.DialogBuilder;
  import com.intellij.openapi.ui.LabeledComponent;
  import com.intellij.openapi.util.Disposer;
 +import com.intellij.openapi.util.text.StringUtil;
  import com.intellij.ui.EditorNotificationPanel;
- import com.intellij.util.containers.HashMap;
- import com.intellij.util.containers.HashSet;
  import com.intellij.util.diff.FilesTooBigForDiffException;
  import gnu.trove.TIntHashSet;
  import org.jetbrains.annotations.NotNull;