diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:51:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:51:32 -0600 |
| commit | 5459fb4c7fae55b0f5ce4826d7bee2c32069d4cb (patch) | |
| tree | 7fdeb64e5bef896a23bdf46847e3ffd3ec460cda /src/gui/dialogs/FileMergeDialog.cpp | |
| parent | 3f02581883759395fcd3935ec1d88ddca4895f32 (diff) | |
| download | rosegarden-5459fb4c7fae55b0f5ce4826d7bee2c32069d4cb.tar.gz rosegarden-5459fb4c7fae55b0f5ce4826d7bee2c32069d4cb.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src/gui/dialogs/FileMergeDialog.cpp')
| -rw-r--r-- | src/gui/dialogs/FileMergeDialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/FileMergeDialog.cpp b/src/gui/dialogs/FileMergeDialog.cpp index d7d48cf..6e4e59d 100644 --- a/src/gui/dialogs/FileMergeDialog.cpp +++ b/src/gui/dialogs/FileMergeDialog.cpp @@ -25,7 +25,7 @@ #include "FileMergeDialog.h" -#include <klocale.h> +#include <tdelocale.h> #include <kcombobox.h> #include <kdialogbase.h> #include <tqcheckbox.h> |