diff options
author | Automated System <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:07:52 -0600 |
---|---|---|
committer | Automated System <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:07:52 -0600 |
commit | 0e1016601a881a8e4bbe62c0beee3bd23d19ab5f (patch) | |
tree | 8bf0f0cfd87710f857e4ed060c5c33af10b8d3c2 /twin/options.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 'twin/options.cpp')
-rw-r--r-- | twin/options.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/twin/options.cpp b/twin/options.cpp index c09bbde61..73d416155 100644 --- a/twin/options.cpp +++ b/twin/options.cpp @@ -17,8 +17,8 @@ License. See the file "COPYING" for the exact licensing terms. #include <tqpixmap.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <tqtooltip.h> #include "client.h" |