diff options
| author | Tilman Keskinoz <arved@FreeBSD.org> | 2003-10-05 10:33:29 +0000 |
|---|---|---|
| committer | Tilman Keskinoz <arved@FreeBSD.org> | 2003-10-05 10:33:29 +0000 |
| commit | 3ae58c662395916799b76fb6ea12d10112a6b7ce (patch) | |
| tree | e07d6ab0cd55e4443c8f5d5b80579f072c79d92b /textproc/kdiff3/files | |
| parent | The new ymessenger is still broken. A quick google suggests that Y! (diff) | |
Update to 0.9.70
PR: 57542
Submitted by: Heiner Eichmann <h.eichmann@gmx.de>
Diffstat (limited to 'textproc/kdiff3/files')
| -rw-r--r-- | textproc/kdiff3/files/patch-pdiff.cpp | 10 | ||||
| -rw-r--r-- | textproc/kdiff3/files/patch-src-directorymergewindow.cpp | 11 |
2 files changed, 11 insertions, 10 deletions
diff --git a/textproc/kdiff3/files/patch-pdiff.cpp b/textproc/kdiff3/files/patch-pdiff.cpp deleted file mode 100644 index 8d9f0d6f21ec..000000000000 --- a/textproc/kdiff3/files/patch-pdiff.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/pdiff.cpp.orig Mon Apr 7 21:12:32 2003 -+++ src/pdiff.cpp Mon Apr 7 21:13:01 2003 -@@ -55,6 +55,7 @@ - #else - #include <unistd.h> - #endif -+#include <ctype.h> - - using namespace std; - diff --git a/textproc/kdiff3/files/patch-src-directorymergewindow.cpp b/textproc/kdiff3/files/patch-src-directorymergewindow.cpp new file mode 100644 index 000000000000..d2be5585f4bc --- /dev/null +++ b/textproc/kdiff3/files/patch-src-directorymergewindow.cpp @@ -0,0 +1,11 @@ +--- src/directorymergewindow.cpp.orig Fri Oct 3 18:32:57 2003 ++++ src/directorymergewindow.cpp Fri Oct 3 18:33:00 2003 +@@ -863,7 +863,7 @@ + + mfi.m_subPath = mfi.m_fileInfoA.exists() ? mfi.m_fileInfoA.filePath() : + mfi.m_fileInfoB.exists() ? mfi.m_fileInfoB.filePath() : +- mfi.m_fileInfoC.exists() ? mfi.m_fileInfoC.filePath() : ""; ++ mfi.m_fileInfoC.exists() ? mfi.m_fileInfoC.filePath() : QString(""); + + g_pProgressDialog->setInformation( + "Processing " + QString::number(currentIdx) +" / "+ QString::number(nrOfFiles) |