diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 00:52:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 00:52:47 -0600 |
| commit | e9bf6fab2dcfd9d3bfe9a874537909aee0256675 (patch) | |
| tree | c3e0ffe2eb0c86459eaa412870797b5dbdd86035 /src/kdiff3.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/kdiff3.cpp')
| -rw-r--r-- | src/kdiff3.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp index 377257b..8d0839a 100644 --- a/src/kdiff3.cpp +++ b/src/kdiff3.cpp @@ -37,11 +37,11 @@ // include files for KDE #include <kiconloader.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmenubar.h> #include <kstatusbar.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstdaction.h> #include <kcmdlineargs.h> #include <kprinter.h> |