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
dbusutils_p.h
kwin-runner-windows.desktop
main.cpp
metadata.json
org.kde.krunner1.xml
windowsrunnerinterface.cpp
windowsrunnerinterface.h