From e0ec84b82a609a73cc82c6727e9a9e54769d60f6 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 27 Aug 2011 21:38:57 +0000
Subject: Fix a number of accidental tqStatus string conversions

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1249829 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 src/directorymergewindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp
index 2a993cf..05959ee 100644
--- a/src/directorymergewindow.cpp
+++ b/src/directorymergewindow.cpp
@@ -299,7 +299,7 @@ DirectoryMergeWindow::DirectoryMergeWindow( TQWidget* pParent, OptionDialog* pOp
    addColumn("B");
    addColumn("C");
    addColumn(i18n("Operation"));
-   addColumn(i18n("tqStatus"));
+   addColumn(i18n("Status"));
    addColumn(i18n("Unsolved"));
    addColumn(i18n("Solved"));
    addColumn(i18n("Nonwhite"));
-- 
cgit v1.2.3