plasma-framework/examples/dataengines
l10n daemon script 24193527bf 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-08-11 04:56:36 +02:00
..
customDataContainers SVN_SILENT made messages (.desktop file) - always resolve ours 2017-08-11 04:56:36 +02:00
dataEngineTracker Port DataEngineTracker example, 2013-09-04 20:12:21 +05:30
simpleEngine SVN_SILENT made messages (.desktop file) - always resolve ours 2017-08-11 04:56:36 +02:00
sourcesOnRequest SVN_SILENT made messages (.desktop file) - always resolve ours 2017-08-11 04:56:36 +02:00
CMakeLists.txt Port customDataContainersEngine example 2013-09-04 19:39:01 +05:30