l10n daemon script 40477aff2d 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-02-22 05:41:10 +01:00
..
common	Enable -DQT_NO_URL_CAST_FROM_STRING and fix compilation	2019-02-12 08:54:53 +01:00
kwincompositing	[kcmkwin/compositing] Delete unused config headers	2019-02-08 17:27:25 +02:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-02-22 05:41:10 +01:00
kwindesktop	[kcmkwin/kwindesktop] show only on desktop	2019-02-13 17:07:04 +05:30
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-06 05:42:41 +01:00
kwinrules	[kcmkwin/rules] Fix line separators in the dialog	2019-01-30 15:56:28 +02:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-02-15 05:42:11 +01:00
kwinscripts	Overhaul doxygen comments	2019-02-12 19:29:33 +02:00
kwintabbox	Overhaul doxygen comments	2019-02-12 19:29:33 +02:00
CMakeLists.txt	[kcmkwin] Move effects model into a shared library	2019-01-08 15:49:20 +02:00