Update message strings KDEInit->TDEInit.
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Added check the conditions for building backtrace handler
Fix remaining battery time estimation.
This supports bug report 1514.
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Add compilation support to enable/disable
[KDE4] suffix in KDE4 menu items.
This resolves bug report 1563.
Rename KStyle to TDEStyle to avoid conflicts with KDE4.
added new build option: WITH_XRANDR
make xcomposite support optional
Merge branch 'current-fixes' of github.com:Fat-Zer/tdelibs into current-fixes

Conflicts:
	CMakeLists.txt