l10n daemon script bba40b9b9d 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-02-05 06:07:10 +01:00
..
basic	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-02-05 06:07:10 +01:00
CMakeLists.txt	Don't install plasmoid for now	2015-12-03 02:45:04 +01:00