l10n daemon script 673a8a7dd9 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-10-17 05:06:20 +02:00

..

CMakeLists.txt

Update installation variables.

2015-01-10 17:47:31 +00:00

plasma-dataengine-example-simpleEngine.desktop

SVN_SILENT made messages (.desktop file) - always resolve ours

2017-10-17 05:06:20 +02:00

simpleEngine.cpp

Port simple DataEngine example

2013-09-04 18:14:53 +05:30

simpleEngine.h

dataengines and runners in examples

2013-09-04 11:57:46 +02:00