l10n daemon script ce39def7d1 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"		2021-06-28 01:23:35 +00:00
..
applets	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-06-28 01:23:35 +00:00
containments	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-28 05:58:18 +02:00
dataengines	dataengine examples: Use K_PLUGIN_CLASS_WITH_JSON directly	2021-06-19 16:53:14 +00:00
developerguide	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-06-28 01:23:35 +00:00
shell	Run clang-format on all cpp/h files	2021-03-13 17:35:34 +00:00
testcontainmentactionsplugin	package structures: Use K_PLUGIN_CLASS_WITH_JSON directly	2021-06-19 16:53:14 +00:00
wallpapers	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-06-28 01:23:35 +00:00
CMakeLists.txt	Replace KF5_VERSION with KF_VERSION	2021-01-29 23:25:42 +01:00
TODO	Port DataEngineTracker example,	2013-09-04 20:12:21 +05:30