diff options
| author | Automated System <[email protected]> | 2013-02-15 22:07:52 -0600 |
|---|---|---|
| committer | Automated System <[email protected]> | 2013-02-15 22:07:52 -0600 |
| commit | 0e1016601a881a8e4bbe62c0beee3bd23d19ab5f (patch) | |
| tree | 8bf0f0cfd87710f857e4ed060c5c33af10b8d3c2 /kdcop | |
| parent | b2502b94cf23298f676853d91188b2cacc6ab0bd (diff) | |
| parent | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (diff) | |
| download | tdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.tar.gz tdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kdcop')
| -rw-r--r-- | kdcop/kdcop.cpp | 2 | ||||
| -rw-r--r-- | kdcop/kdcopwindow.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kdcop/kdcop.cpp b/kdcop/kdcop.cpp index 102eb4bea..436a4a59a 100644 --- a/kdcop/kdcop.cpp +++ b/kdcop/kdcop.cpp @@ -4,7 +4,7 @@ * Licensed under the Artistic License. */ #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp index 12bb5f0c8..6cf245795 100644 --- a/kdcop/kdcopwindow.cpp +++ b/kdcop/kdcopwindow.cpp @@ -9,14 +9,14 @@ #include "kdcoplistview.h" #include <dcopclient.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdatastream.h> #include <kstdaction.h> #include <tdeaction.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <klineedit.h> #include <keditlistbox.h> |