l10n daemon script b07ba3baa3 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-12-19 05:50:20 +01:00
..
kwincompositing	[kcmkwin/compositing] Remove effect list item selection, fix list item size after hiding the effect video, use a real button as the play button and use the right busy indicator	2018-12-11 08:01:46 -07:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-22 06:02:11 +01:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-12-19 05:50:20 +01:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-22 06:02:11 +01:00
kwinrules	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-22 06:02:11 +01:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-22 06:02:11 +01:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-22 06:02:11 +01:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-22 06:02:11 +01:00
CMakeLists.txt