l10n daemon script 051cba15ce 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-06-02 09:11:06 +02:00
..
common	[kcmkwin] Remove redundant lambda	2020-03-30 19:39:09 +03:00
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-02 09:11:06 +02:00
kwindecoration	Merge branch 'Plasma/5.18'	2020-05-06 15:15:42 +02:00
kwindesktop	Merge branch 'Plasma/5.18'	2020-03-29 18:17:54 -06:00
kwineffects	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-05-12 06:33:43 +02:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-02 09:11:06 +02:00
kwinrules	[kcm/kwinrules] Fix "window role" combo not showing up	2020-06-01 20:23:40 +02:00
kwinscreenedges	Fix compile with strict iterator	2020-05-01 13:02:39 +02:00
kwinscripts	kcmkwin/scripts: make default button work	2020-03-13 11:08:56 +01:00
kwintabbox	KCM KWinTabbox disable widget if property is immutable.	2020-04-14 14:08:36 +02:00
CMakeLists.txt	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00