l10n daemon script 9a10eabc11 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-04-13 09:34:52 +00:00
..
idletime
kglobalaccel
platforms	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-04-13 09:34:52 +00:00
qpa
CMakeLists.txt	Move backends/ to plugins/platforms/	2016-04-12 08:01:27 +02:00