l10n daemon script 58ae454f6b 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-12-17 06:47:43 +01:00
..
common	[kcms/effectsmodel] Add config module role to effectsmodel and use it to open config	2020-11-08 13:36:32 +00:00
kwincompositing	Trim trailing whitespace	2020-11-28 11:01:47 +00:00
kwindecoration	Add a QRect to showWindowMenu	2020-11-22 21:47:31 +00:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-12-09 06:48:24 +01:00
kwineffects	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-11-16 06:14:08 +01:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-12-17 06:47:43 +01:00
kwinrules	kcm/rules: Add a Duplicate action to rules list	2020-11-29 00:16:51 +01:00
kwinscreenedges	[kcmkwin/kwinscreenedges] Disable left touch edge by default	2020-11-20 14:25:15 +00:00
kwinscripts	Do not explicitely define Exec line for KCM	2020-10-19 15:53:26 +00:00
kwintabbox	Do not explicitely define Exec line for KCM	2020-10-19 15:53:26 +00:00
CMakeLists.txt	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00