plasma-framework/examples/dataengines
l10n daemon script 9a3351fae5 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"
2019-08-20 04:58:25 +02:00
..
customDataContainers SVN_SILENT made messages (.desktop file) - always resolve ours 2019-08-20 04:58:25 +02:00
dataEngineTracker Use nullptr + add explicit 2017-12-13 07:36:22 +01:00
simpleEngine SVN_SILENT made messages (.desktop file) - always resolve ours 2019-08-20 04:58:25 +02:00
sourcesOnRequest SVN_SILENT made messages (.desktop file) - always resolve ours 2019-08-20 04:58:25 +02:00
CMakeLists.txt Fix minor typos 2018-09-05 22:22:38 +03:00