l10n daemon script 867552fce4 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"		2019-12-22 09:21:14 +01:00
..
common	Use more traditional doxygen style	2019-07-29 22:06:19 +03:00
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-23 09:01:14 +02:00
kwindecoration	[kcmkwin/kwindecoration] Better presentation of tabs	2019-11-28 19:39:21 +01:00
kwindesktop	[kcmkwin/desktop] Elide "Show animation when switching" checkbox text	2019-10-28 07:57:18 -06:00
kwineffects	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-12-22 09:21:14 +01:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-12-22 09:21:14 +01:00
kwinrules	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-12-10 09:23:03 +01:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-23 09:01:14 +02:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-23 09:01:14 +02:00
CMakeLists.txt	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00