From bbdd58158837c2fd2f6152fad2ad652e9631044e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 20:31:45 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 main/applications/kdiff3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'main/applications/kdiff3')

diff --git a/main/applications/kdiff3 b/main/applications/kdiff3
index 046d6d18d..fd7791939 160000
--- a/main/applications/kdiff3
+++ b/main/applications/kdiff3
@@ -1 +1 @@
-Subproject commit 046d6d18d5e6e3ca95711968793d8c46f56de6e8
+Subproject commit fd7791939e48e06e7f0b9cc9d32738757783e180
-- 
cgit v1.2.1