From 76718abdb2138623102398a10f3228e576dd0ae8 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 10 Feb 2010 01:27:27 +0000
Subject: Added abandoned KDE3 version of kdiff3

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1088041 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 doc/en/merge_current.png | Bin 0 -> 184 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 doc/en/merge_current.png

(limited to 'doc/en/merge_current.png')

diff --git a/doc/en/merge_current.png b/doc/en/merge_current.png
new file mode 100644
index 0000000..3f2e341
Binary files /dev/null and b/doc/en/merge_current.png differ
-- 
cgit v1.2.3