l10n daemon script 8e140db62e 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"		2023-01-02 02:31:51 +00:00
..
common	kcms/kwineffects: use new term "Peek at Desktop"	2022-12-29 18:03:02 +00:00
compositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-12-30 02:09:12 +00:00
decoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-12-30 02:09:12 +00:00
desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-12-30 02:09:12 +00:00
effects	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-12-30 02:09:12 +00:00
options	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-12-30 02:09:12 +00:00
rules	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-01-02 02:31:51 +00:00
screenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-01-01 02:21:02 +00:00
scripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-01-02 02:31:51 +00:00
tabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-01-02 02:31:51 +00:00
virtualkeyboard	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-12-30 02:09:12 +00:00
xwayland	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-01-01 02:21:02 +00:00
CMakeLists.txt