summaryrefslogtreecommitdiffstats
path: root/doc/et/merge_current.png
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-02-10 01:27:27 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-02-10 01:27:27 +0000
commit76718abdb2138623102398a10f3228e576dd0ae8 (patch)
treeddb098baac9689b9e661a41c2a28a8a23ef246d4 /doc/et/merge_current.png
downloadkdiff3-76718abdb2138623102398a10f3228e576dd0ae8.tar.gz
kdiff3-76718abdb2138623102398a10f3228e576dd0ae8.zip
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
Diffstat (limited to 'doc/et/merge_current.png')
-rw-r--r--doc/et/merge_current.pngbin0 -> 184 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/et/merge_current.png b/doc/et/merge_current.png
new file mode 100644
index 0000000..3f2e341
--- /dev/null
+++ b/doc/et/merge_current.png
Binary files differ