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 /kdesktop/desktop.cc | |
| 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 'kdesktop/desktop.cc')
| -rw-r--r-- | kdesktop/desktop.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc index 75721c689..45ae1e8e5 100644 --- a/kdesktop/desktop.cc +++ b/kdesktop/desktop.cc @@ -48,17 +48,17 @@ #include <kimageio.h> #include <kinputdialog.h> #include <kipc.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/netaccess.h> #include <kprocess.h> #include <tdesycoca.h> -#include <ktempfile.h> -#include <kmessagebox.h> +#include <tdetempfile.h> +#include <tdemessagebox.h> #include <kglobalaccel.h> #include <twinmodule.h> #include <krun.h> #include <twin.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdepopupmenu.h> #include <tdeapplication.h> #include <kdirlister.h> |