summaryrefslogtreecommitdiffstats
path: root/nsplugins/pluginscan.cpp
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 /nsplugins/pluginscan.cpp
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 'nsplugins/pluginscan.cpp')
-rw-r--r--nsplugins/pluginscan.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp
index f8731a6c7..0b6855c42 100644
--- a/nsplugins/pluginscan.cpp
+++ b/nsplugins/pluginscan.cpp
@@ -42,7 +42,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <klibloader.h>
#include <tdeconfig.h>
@@ -52,7 +52,7 @@
#include <kmimetype.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "sdk/npupp.h"
#include <X11/Intrinsic.h>