plasma-framework/examples/dataengines/customDataContainers
l10n daemon script 973051ef3d 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-09-07 05:56:59 +02:00
..
CMakeLists.txt Update installation variables. 2015-01-10 17:47:31 +00:00
customDataContainersEngine.cpp plasma-framework: Convert copyright statements to SPDX expressions 2020-08-13 19:08:54 +00:00
customDataContainersEngine.h plasma-framework: Convert copyright statements to SPDX expressions 2020-08-13 19:08:54 +00:00
httpContainer.cpp plasma-framework: Convert copyright statements to SPDX expressions 2020-08-13 19:08:54 +00:00
httpContainer.h plasma-framework: Convert copyright statements to SPDX expressions 2020-08-13 19:08:54 +00:00
plasma-dataengine-example-customDataContainers.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-07 05:56:59 +02:00