From a655a560fb6780c4a0c1dabb1fd31eddf5d462c9 Mon Sep 17 00:00:00 2001
From: Peter Penz <peter.penz19@gmail.com>
Date: Mon, 13 Jul 2009 20:39:44 +0000
Subject: The Oxygen team will provide revision control emblems for KDE 4.4.
 Adjust the code to use icons instead of coloring the text... The icon
 position at the moment is terrible, an interface extension in
 KFileItemDelegate is required to get the icon boundaries.

svn path=/trunk/KDE/kdebase/apps/; revision=996101
---
 src/revisioncontrolplugin.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/revisioncontrolplugin.h')

diff --git a/src/revisioncontrolplugin.h b/src/revisioncontrolplugin.h
index 6cacb9224..2fd7d77c0 100644
--- a/src/revisioncontrolplugin.h
+++ b/src/revisioncontrolplugin.h
@@ -36,7 +36,8 @@ public:
     enum RevisionState
     {
         LocalRevision,
-        LatestRevision
+        LatestRevision,
+        ConflictingRevision
         // TODO...
     };
 
-- 
cgit v1.3