l10n daemon script cdfc7512aa 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"		2020-09-08 06:34:57 +02:00
..
python	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-08 06:34:57 +02:00
qml	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-08 06:34:57 +02:00
ruby	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-08 06:34:57 +02:00
CMakeLists.txt	port libplasma away from sycoca as much as possible	2015-05-07 16:26:37 +02:00