l10n daemon script a92fa79cc0 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-02 04:31:48 +01:00
..
declarativeimports
desktoptheme	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-11-29 04:25:11 +01:00
plasma	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-02 04:31:48 +01:00
plasmapkg
plasmaquick
scriptengines
tools
CMakeLists.txt
Messages.sh