l10n daemon script f859c2184a 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-01-28 05:51:43 +01:00
..
CMakeLists.txt	Change project name to "KWin"	2020-01-25 03:05:02 +02: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-01-28 05:51:43 +01:00
main.cpp
Messages.sh