l10n daemon script 9c0a71c37f 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-07-13 05:18:09 +02:00
..
common	Port away from deprecated qSort function	2019-07-10 00:00:29 +03:00
kwincompositing	Port away from deprecated qSort function	2019-07-10 00:00:29 +03:00
kwindecoration	Don't use deprecated QPalette::background()	2019-07-10 22:49:40 +03:00
kwindesktop
kwineffects	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-13 05:18:09 +02:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-13 05:18:09 +02:00
kwinrules	Port away from deprecated headers	2019-07-09 23:59:07 +03:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-13 05:18:09 +02:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-13 05:18:09 +02:00
kwintabbox	Don't use deprecated QDesktopWidget	2019-07-10 22:50:41 +03:00
CMakeLists.txt