l10n daemon script 27ba893b75 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-10 05:51:14 +01:00
..
common	Update my last name	2019-09-29 17:03:25 +03:00
kwincompositing	Port away from overloaded KCModule signal	2019-12-02 09:03:14 +00:00
kwindecoration	Notify about window decorations buttons order changes	2019-12-03 12:10:10 -07:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-11-02 05:41:14 +01:00
kwineffects	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-11-03 08:54:23 +01:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-11-20 09:25:27 +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