plasma-framework/examples/dataengines/customDataContainers
l10n daemon script 1049bca147 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-05-31 20:19:54 +02: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 Fix minor typos 2018-09-05 22:22:38 +03:00
httpContainer.h Get rid of deprecated QWeakPointer usage 2018-08-17 15:44:08 +02:00
plasma-dataengine-example-customDataContainers.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-05-31 20:19:54 +02:00