l10n daemon script 56e3b5b116 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"		2016-08-29 09:19:15 +00:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-08-16 10:09:08 +00:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-08-29 09:19:15 +00:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-08-29 09:19:15 +00:00
kwinoptions
kwinrules	Move X11Cursor into the x11standalone platform plugin	2016-08-19 10:57:09 +02:00
kwinscreenedges
kwinscripts
kwintabbox
CMakeLists.txt