l10n daemon script 0fcc20b51b 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-12-01 05:42:23 +01:00
..
CMakeLists.txt
compositing.cpp	Remove vsync detection and configurability	2019-11-14 08:55:08 +01:00
compositing.h
compositing.ui	Remove vsync detection and configurability	2019-11-14 08:55:08 +01:00
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-12-01 05:42:23 +01:00
main.cpp
Messages.sh