l10n daemon script 04979d892f 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-12 06:02:49 +01:00
..
common	KCM/Effects: convert a couple C-style cast	2019-12-30 11:32:30 +01:00
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-01-04 06:12:32 +01:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-01-04 06:12:32 +01:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-01-04 06:12:32 +01:00
kwineffects	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-01-04 06:12:32 +01:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-01-12 06:02:49 +01:00
kwinrules	Add some const &	2019-10-30 19:23:01 +01:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-01-04 06:12:32 +01:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-11-02 05:41:14 +01:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-01-04 06:12:32 +01:00
CMakeLists.txt	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00