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 /kcontrol/view1394/view1394.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 'kcontrol/view1394/view1394.cpp')
-rw-r--r-- | kcontrol/view1394/view1394.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kcontrol/view1394/view1394.cpp b/kcontrol/view1394/view1394.cpp index 09214adbd..74bba77f2 100644 --- a/kcontrol/view1394/view1394.cpp +++ b/kcontrol/view1394/view1394.cpp @@ -24,8 +24,8 @@ #include <tqtextstream.h> #include <kdialog.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include "view1394.h" |