l10n daemon script 88bd746694 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-06 12:43:39 +00:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-07-28 13:13:42 +00:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-07-25 13:28:09 +00:00
kwindesktop
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-06-23 23:41:42 +00:00
kwinrules	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-06-23 23:41:42 +00:00
kwinscreenedges
kwinscripts
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-08-06 12:43:39 +00:00
CMakeLists.txt