summaryrefslogtreecommitdiffstats
path: root/twin/activation.cpp
diff options
context:
space:
mode:
authorAutomated System <kb9vqf@pearsoncomputing.net>2013-02-15 22:07:52 -0600
committerAutomated System <kb9vqf@pearsoncomputing.net>2013-02-15 22:07:52 -0600
commit0e1016601a881a8e4bbe62c0beee3bd23d19ab5f (patch)
tree8bf0f0cfd87710f857e4ed060c5c33af10b8d3c2 /twin/activation.cpp
parentb2502b94cf23298f676853d91188b2cacc6ab0bd (diff)
parent77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (diff)
downloadtdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.tar.gz
tdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'twin/activation.cpp')
-rw-r--r--twin/activation.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/twin/activation.cpp b/twin/activation.cpp
index ba95cde04..36b9e88f1 100644
--- a/twin/activation.cpp
+++ b/twin/activation.cpp
@@ -18,9 +18,9 @@ License. See the file "COPYING" for the exact licensing terms.
#include <tqpopupmenu.h>
#include <kxerrorhandler.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
#include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "client.h"
#include "workspace.h"