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