l10n daemon script 43f575b415 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"		2017-12-13 07:01:42 +01:00
..
common
standalone	Merge branch 'Plasma/5.11'	2017-11-20 18:13:35 +01:00
windowed	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-13 07:01:42 +01:00
CMakeLists.txt