diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:52:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:52:08 -0600 |
| commit | 784a2227ffdcb03a1e37b1390a8b6e0985ddda9c (patch) | |
| tree | 2497bf931758f4bbbf3ec4c538c947b1df27692b /src/entrymerger.cpp | |
| parent | 2b2b805df5f62a0bc900253dd3e774f2e2ad31e3 (diff) | |
| download | tellico-784a2227ffdcb03a1e37b1390a8b6e0985ddda9c.tar.gz tellico-784a2227ffdcb03a1e37b1390a8b6e0985ddda9c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src/entrymerger.cpp')
| -rw-r--r-- | src/entrymerger.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/entrymerger.cpp b/src/entrymerger.cpp index abe4998..62de6c1 100644 --- a/src/entrymerger.cpp +++ b/src/entrymerger.cpp @@ -20,7 +20,7 @@ #include "statusbar.h" #include "tellico_debug.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqtimer.h> |