l10n daemon script b1a115aa76 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-12-05 06:33:37 +01:00
..
CMakeLists.txt	Turn krunner integration into a plugin	2020-11-25 09:34:25 +00:00
dbusutils_p.h	Turn krunner integration into a plugin	2020-11-25 09:34:25 +00:00
kwin-runner-windows.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-12-05 06:33:37 +01:00
main.cpp	Turn krunner integration into a plugin	2020-11-25 09:34:25 +00:00
metadata.json	Turn krunner integration into a plugin	2020-11-25 09:34:25 +00:00
org.kde.krunner1.xml	Turn krunner integration into a plugin	2020-11-25 09:34:25 +00:00
windowsrunnerinterface.cpp	Turn krunner integration into a plugin	2020-11-25 09:34:25 +00:00
windowsrunnerinterface.h	Turn krunner integration into a plugin	2020-11-25 09:34:25 +00:00