l10n daemon script cba442b079 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"		2020-05-30 16:31:27 +02:00
..
CMakeLists.txt	Revert "[kcm/effects] Clip ListView"	2020-02-22 11:53:59 +01:00
compositing.cpp	Revert "Remove vsync detection and configurability"	2020-01-16 10:00:12 +01:00
compositing.h
compositing.ui	Revert "Remove vsync detection and configurability"	2020-01-16 10:00:12 +01:00
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-05-30 16:31:27 +02:00
main.cpp
Messages.sh