l10n daemon script fe27d39b5c 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"		2019-10-17 05:41:38 +02:00
..
CMakeLists.txt
showfps.cpp	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
showfps.h
showfps.kcfg
showfps_config.cpp
showfps_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-17 05:41:38 +02:00
showfps_config.h	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
showfps_config.ui
showfpsconfig.kcfgc