plasma-framework/examples/dataengines
l10n daemon script 973051ef3d 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-07 05:56:59 +02:00
..
customDataContainers SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-07 05:56:59 +02:00
dataEngineTracker plasma-framework: Convert copyright statements to SPDX expressions 2020-08-13 19:08:54 +00:00
simpleEngine SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-07 05:56:59 +02:00
sourcesOnRequest SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-07 05:56:59 +02:00
CMakeLists.txt Fix minor typos 2018-09-05 22:22:38 +03:00