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/konqhtml/htmlopts.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/konqhtml/htmlopts.cpp')
| -rw-r--r-- | kcontrol/konqhtml/htmlopts.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp index 2fe6eb963..0fb7f6021 100644 --- a/kcontrol/konqhtml/htmlopts.cpp +++ b/kcontrol/konqhtml/htmlopts.cpp @@ -15,8 +15,8 @@ #include "advancedTabDialog.h" #include <konq_defaults.h> // include default values directly from konqueror -#include <kglobalsettings.h> // get default for DEFAULT_CHANGECURSOR -#include <klocale.h> +#include <tdeglobalsettings.h> // get default for DEFAULT_CHANGECURSOR +#include <tdelocale.h> #include <kdialog.h> #include <knuminput.h> #include <kseparator.h> |