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 /kicker/taskbar | |
| 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 'kicker/taskbar')
| -rw-r--r-- | kicker/taskbar/taskbar.cpp | 4 | ||||
| -rw-r--r-- | kicker/taskbar/taskcontainer.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp index ab2b77fff..8f1f4a6ac 100644 --- a/kicker/taskbar/taskbar.cpp +++ b/kicker/taskbar/taskbar.cpp @@ -35,10 +35,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <dcopclient.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kglobalaccel.h> #include <kimageeffect.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include "kickerSettings.h" diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index fce2256dc..166175f66 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/kicker/taskbar/taskcontainer.cpp @@ -38,8 +38,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeapplication.h> #include <kdebug.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <kiconeffect.h> #include <kiconloader.h> #include <kimageeffect.h> |