kwin/plugins/krunner-integration
l10n daemon script 1d8ebfa475 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-02-02 07:28:08 +01:00
..
CMakeLists.txt
dbusutils_p.h
kwin-runner-windows.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2021-02-02 07:28:08 +01:00
main.cpp
metadata.json
org.kde.krunner1.xml
windowsrunnerinterface.cpp
windowsrunnerinterface.h