l10n daemon script f53cf9d71e 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-30 01:21:12 +00:00
..
CMakeLists.txt	Use version-less qt DBus macros	2021-05-31 01:00:35 +02:00
dbusutils_p.h
kwin-runner-windows.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-06-30 01:21:12 +00:00
main.cpp	plugins: Port away from deprecated version checks	2021-06-07 15:01:19 +00:00
metadata.json
org.kde.krunner1.xml
windowsrunnerinterface.cpp	--warning: Remove unnecessay cast	2021-05-14 01:35:33 +02:00
windowsrunnerinterface.h