diff options
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java')
| -rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java index 0c15f00de..7f286b5a0 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java @@ -15,6 +15,7 @@ public interface ICVSUIConstants { // overlays public final String IMG_MERGEABLE_CONFLICT = "ovr16/confauto_ov.gif"; public final String IMG_QUESTIONABLE = "ovr16/question_ov.gif"; + public final String IMG_MERGED = "ovr16/merged_ov.gif"; // objects public final String IMG_REPOSITORY = "obj16/repository_rep.gif"; |