plasma-framework/examples/dataengines
l10n daemon script 793441b77b 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"
2016-12-20 12:53:44 +01:00
..
customDataContainers SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-20 12:53:44 +01:00
dataEngineTracker Port DataEngineTracker example, 2013-09-04 20:12:21 +05:30
simpleEngine SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-20 12:53:44 +01:00
sourcesOnRequest SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-20 12:53:44 +01:00
CMakeLists.txt Port customDataContainersEngine example 2013-09-04 19:39:01 +05:30