l10n daemon script 30b516eceb 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-09-30 06:16:48 +02:00
..
common	Prettify license headers	2020-08-07 19:57:56 +00:00
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
kwineffects	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
kwinrules	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
CMakeLists.txt