l10n daemon script 835181f3ca 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"		2018-07-12 05:15:22 +02:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-12 05:15:22 +02:00
kwindecoration	Fix KDeclarative::setupBindings() deprecation warnings	2018-07-02 12:46:00 +03:00
kwindesktop	[kcmkwin/kwindesktop] Use PackageLoader to get effect metadata	2018-07-06 17:15:23 +03:00
kwinoptions	Remove Qt module declarations in includes	2018-06-05 18:07:23 +01:00
kwinrules	Remove Qt module declarations in includes	2018-06-05 18:07:23 +01:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-26 05:41:33 +02:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-18 05:35:02 +02:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-18 05:35:02 +02:00
CMakeLists.txt