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 /konqueror/shellcmdplugin/kshellcmdexecutor.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 'konqueror/shellcmdplugin/kshellcmdexecutor.cpp')
| -rw-r--r-- | konqueror/shellcmdplugin/kshellcmdexecutor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp index 3f93feade..e5e8dabe4 100644 --- a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp +++ b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp @@ -27,9 +27,9 @@ #include <tqsocketnotifier.h> #include <kinputdialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdesu/process.h> -#include <klocale.h> +#include <tdelocale.h> KShellCommandExecutor::KShellCommandExecutor(const TQString& command, TQWidget* parent) :TQTextView(parent) |