l10n daemon script 1d622fbbc3 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-12-22 05:55:50 +01:00
..
idletime
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-22 05:55:50 +01:00
kglobalaccel
platforms	[platforms/hwcomposer] Use enum instead of the number for readable code	2016-12-16 14:49:29 +05:30
qpa
CMakeLists.txt