diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:45:50 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:45:50 -0600 |
| commit | dbf3ee6a200368cbe33ce33f06a1534aa5de241b (patch) | |
| tree | 5a4e7bffa0a86437e9b6e099497468113e63fa96 /src/mergeresultwindow.cpp | |
| parent | 5d58fe4201cc465d1bc54f4c9530c653af7809a8 (diff) | |
| download | kdiff3-dbf3ee6a200368cbe33ce33f06a1534aa5de241b.tar.gz kdiff3-dbf3ee6a200368cbe33ce33f06a1534aa5de241b.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src/mergeresultwindow.cpp')
| -rw-r--r-- | src/mergeresultwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp index 760d794..f52d0a3 100644 --- a/src/mergeresultwindow.cpp +++ b/src/mergeresultwindow.cpp @@ -34,8 +34,8 @@ #include <tqtextcodec.h> #include <tqdragobject.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <iostream> int g_bAutoSolve = true; |