diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:47 -0600 |
| commit | e9bf6fab2dcfd9d3bfe9a874537909aee0256675 (patch) | |
| tree | c3e0ffe2eb0c86459eaa412870797b5dbdd86035 /src/directorymergewindow.cpp | |
| parent | 00d0a95b8c6deb786c62c9520f4716942788d02a (diff) | |
| download | kdiff3-e9bf6fab2dcfd9d3bfe9a874537909aee0256675.tar.gz kdiff3-e9bf6fab2dcfd9d3bfe9a874537909aee0256675.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'src/directorymergewindow.cpp')
| -rw-r--r-- | src/directorymergewindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp index b4f6b20..c56f69b 100644 --- a/src/directorymergewindow.cpp +++ b/src/directorymergewindow.cpp @@ -35,7 +35,7 @@ #include <tqtextedit.h> #include <tqprogressdialog.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconloader.h> #include <klocale.h> #include <iostream> |