l10n daemon script a5b03f74ee SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"		2018-11-01 05:58:11 +01:00
..
CMakeLists.txt	Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json()	2015-12-09 23:42:45 +00:00
showfps.cpp	Fix build with a KWindowSystem framework that doesn't pull QWidget	2017-11-17 17:30:58 +01:00
showfps.h	Fix build with a KWindowSystem framework that doesn't pull QWidget	2017-11-17 17:30:58 +01:00
showfps.kcfg	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
showfps_config.cpp	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
showfps_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-01 05:58:11 +01:00
showfps_config.h	Use Q_SLOTS and Q_SIGNALS instead of slots and signals	2013-07-24 09:46:54 +02:00
showfps_config.ui	Use KConfigXT in ShowFps Effect	2012-09-14 10:39:27 +02:00
showfpsconfig.kcfgc	Use KConfigXT in ShowFps Effect	2012-09-14 10:39:27 +02:00