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 /khotkeys/kcontrol/kcmkhotkeys.cpp | |
| 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 'khotkeys/kcontrol/kcmkhotkeys.cpp')
| -rw-r--r-- | khotkeys/kcontrol/kcmkhotkeys.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp index 5d6e1aad7..5f9e4d5fc 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.cpp +++ b/khotkeys/kcontrol/kcmkhotkeys.cpp @@ -24,14 +24,14 @@ #include <tdecmodule.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <dcopclient.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <kglobal.h> +#include <tdemessagebox.h> +#include <tdeglobal.h> #include <ksimpleconfig.h> #include <tdefiledialog.h> #include <dcopref.h> |