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 /tdeioslave/media/mounthelper/tdeio_media_mounthelper.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 'tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp')
-rw-r--r-- | tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp index c130d5dcb..230d69715 100644 --- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp +++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp @@ -20,18 +20,18 @@ */ #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kurl.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <dcopclient.h> #include <dcopref.h> #include <tqtimer.h> #include <stdlib.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kprocess.h> -#include <kstartupinfo.h> +#include <tdestartupinfo.h> #include <kmimetype.h> #include "dialog.h" |