plasma-framework/examples/dataengines/customDataContainers
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
..
CMakeLists.txt Update installation variables. 2015-01-10 17:47:31 +00:00
customDataContainersEngine.cpp [Examples] Fix build 2018-01-26 15:48:27 +01:00
customDataContainersEngine.h [Examples] Fix build 2018-01-26 15:48:27 +01:00
httpContainer.cpp [Examples] Fix build 2018-01-26 15:48:27 +01:00
httpContainer.h [Examples] Fix build 2018-01-26 15:48:27 +01:00
plasma-dataengine-example-customDataContainers.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-02-25 05:27:39 +01:00