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 /libkonq/konq_iconviewwidget.cc | |
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 'libkonq/konq_iconviewwidget.cc')
-rw-r--r-- | libkonq/konq_iconviewwidget.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc index a0a4dfd4c..18997a71b 100644 --- a/libkonq/konq_iconviewwidget.cc +++ b/libkonq/konq_iconviewwidget.cc @@ -39,7 +39,7 @@ #include <tdefileivi.h> #include <konq_settings.h> #include <konq_drag.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kpropertiesdialog.h> #include <kipc.h> #include <kicontheme.h> @@ -51,7 +51,7 @@ #include <assert.h> #include <unistd.h> -#include <klocale.h> +#include <tdelocale.h> struct KonqIconViewWidgetPrivate |