plasma-framework/examples/dataengines
l10n daemon script e80ebab9db 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"
2018-02-25 05:27:39 +01:00
..
customDataContainers SVN_SILENT made messages (.desktop file) - always resolve ours 2018-02-25 05:27:39 +01:00
dataEngineTracker Use nullptr + add explicit 2017-12-13 07:36:22 +01:00
simpleEngine SVN_SILENT made messages (.desktop file) - always resolve ours 2018-02-25 05:27:39 +01:00
sourcesOnRequest SVN_SILENT made messages (.desktop file) - always resolve ours 2018-02-25 05:27:39 +01:00
CMakeLists.txt Port customDataContainersEngine example 2013-09-04 19:39:01 +05:30