l10n daemon script 91abcdbcfa 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-02-17 05:51:10 +01:00
..
common	Change project name to "KWin"	2020-01-25 03:05:02 +02:00
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-02-17 05:51:10 +01:00
kwindecoration	Extract messages from header file as well, optimize extraction	2020-02-16 11:55:17 +02:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-02-11 05:59:16 +01:00
kwineffects	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-02-09 05:53:12 +01:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-02-09 05:53:12 +01:00
kwinrules	Drop kdeinit linking	2020-01-22 12:46:10 +00:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-02-11 05:59:16 +01:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-11-02 05:41:14 +01:00
kwintabbox	Change project name to "KWin"	2020-01-25 03:05:02 +02:00
CMakeLists.txt	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00