summaryrefslogtreecommitdiffstats
path: root/khotkeys/app
diff options
context:
space:
mode:
authorAutomated System <[email protected]>2013-02-15 22:07:52 -0600
committerAutomated System <[email protected]>2013-02-15 22:07:52 -0600
commit0e1016601a881a8e4bbe62c0beee3bd23d19ab5f (patch)
tree8bf0f0cfd87710f857e4ed060c5c33af10b8d3c2 /khotkeys/app
parentb2502b94cf23298f676853d91188b2cacc6ab0bd (diff)
parent77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (diff)
downloadtdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.tar.gz
tdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'khotkeys/app')
-rw-r--r--khotkeys/app/app.cpp2
-rw-r--r--khotkeys/app/kded.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/khotkeys/app/app.cpp b/khotkeys/app/app.cpp
index 0d0fd3395..27e78d90c 100644
--- a/khotkeys/app/app.cpp
+++ b/khotkeys/app/app.cpp
@@ -18,7 +18,7 @@
#include <tdecmdlineargs.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/khotkeys/app/kded.cpp b/khotkeys/app/kded.cpp
index 743e0fb04..afbd2bceb 100644
--- a/khotkeys/app/kded.cpp
+++ b/khotkeys/app/kded.cpp
@@ -18,7 +18,7 @@
#include <tdecmdlineargs.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <stdio.h>