diff options
| author | Automated System <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:07:52 -0600 |
|---|---|---|
| committer | Automated System <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:07:52 -0600 |
| commit | 0e1016601a881a8e4bbe62c0beee3bd23d19ab5f (patch) | |
| tree | 8bf0f0cfd87710f857e4ed060c5c33af10b8d3c2 /ksmserver/main.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 'ksmserver/main.cpp')
| -rw-r--r-- | ksmserver/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp index 91d45d031..1004c4394 100644 --- a/ksmserver/main.cpp +++ b/ksmserver/main.cpp @@ -20,8 +20,8 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include "server.h" |