kwin/effects/showfps
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
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
showfps_config.cpp
showfps_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-11-01 05:58:11 +01:00
showfps_config.h
showfps_config.ui
showfpsconfig.kcfgc