l10n daemon script e180a8b2b0 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-08-13 05:31:32 +02:00
..
common	Use more traditional doxygen style	2019-07-29 22:06:19 +03:00
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-07 05:12:10 +02:00
kwindecoration	[kcmkwin/kwindecoration] Slightly improve tab bar's integration with frame	2019-08-01 16:44:28 -06:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-13 05:31:32 +02:00
kwineffects	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-07 05:12:10 +02:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-07 05:12:10 +02:00
kwinrules	Run clang-tidy with modernize-use-override check	2019-07-22 20:03:22 +03:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-13 05:31:32 +02:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-07 05:12:10 +02:00
kwintabbox	Use more traditional doxygen style	2019-07-29 22:06:19 +03:00
CMakeLists.txt