l10n daemon script aa3691b831 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-07-21 10:07:48 +00:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-07-21 10:07:48 +00:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-06-23 23:41:42 +00:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-05-31 11:06:54 +00:00
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	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-05-31 11:06:54 +00:00
kwinscripts	pedantic fixes	2016-07-16 13:14:44 -04:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-05-31 11:06:54 +00:00
CMakeLists.txt