diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:11:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:11:02 -0600 |
| commit | 533c3127e1498430584d456034fe2558101d99cb (patch) | |
| tree | c65bb79b9fe98e34fbdca81ae843289fd47d14f0 /src/kdiff3_shell.cpp | |
| parent | 821dbb340f650965ff257f4dec7b31ed7458c6e1 (diff) | |
| download | kdiff3-533c3127e1498430584d456034fe2558101d99cb.tar.gz kdiff3-533c3127e1498430584d456034fe2558101d99cb.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src/kdiff3_shell.cpp')
| -rw-r--r-- | src/kdiff3_shell.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/kdiff3_shell.cpp b/src/kdiff3_shell.cpp index 287a9b3..8bcc460 100644 --- a/src/kdiff3_shell.cpp +++ b/src/kdiff3_shell.cpp @@ -27,7 +27,7 @@ #include <kedittoolbar.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <klibloader.h> |