l10n daemon script b78a104f50 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-24 05:45:06 +01:00
..
common	[KCM/Effects] Allow the user to know when the settings are set to default	2019-12-20 17:53:41 +01:00
kwincompositing	Port away from overloaded KCModule signal	2019-12-02 09:03:14 +00:00
kwindecoration	Remove deprecated method	2019-12-23 14:09:02 +01:00
kwindesktop	[KCM/Desktop] Port from KQuickAddons::ConfigModule to ManagedConfigModule	2019-12-23 13:22:36 +01:00
kwineffects	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-12-22 05:40:21 +01:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-12-24 05:45:06 +01:00
kwinrules	Add some const &	2019-10-30 19:23:01 +01:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-12-10 05:51:14 +01:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-11-02 05:41:14 +01:00
kwintabbox	[kcmkwin/tabbox] Use an enum for role names	2019-11-22 21:38:29 +02:00
CMakeLists.txt	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00