l10n daemon script 2544d1c9c7 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-06-12 05:14:10 +02:00
..
python	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-06-12 05:14:10 +02:00
qml	Port a bunch of classes away from Plasma::Package	2017-06-06 15:11:25 +02:00
ruby	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-02-05 06:07:10 +01:00
CMakeLists.txt	port libplasma away from sycoca as much as possible	2015-05-07 16:26:37 +02:00