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_shell.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_shell.cpp')
| -rw-r--r-- | src/kdiff3_shell.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kdiff3_shell.cpp b/src/kdiff3_shell.cpp index a8a2a84..287a9b3 100644 --- a/src/kdiff3_shell.cpp +++ b/src/kdiff3_shell.cpp @@ -21,8 +21,8 @@ #include "kdiff3.h" #include <kkeydialog.h> -#include <kfiledialog.h> -#include <kconfig.h> +#include <tdefiledialog.h> +#include <tdeconfig.h> #include <kurl.h> #include <kedittoolbar.h> |