l10n daemon script fb7f507d8e 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-10 08:21:09 +01:00
..
CMakeLists.txt	GIT_SILENT: dont use deprecated cmake variable	2021-01-29 11:34:52 +01:00
dbusutils_p.h	KRunner integration: Send window pixmap along	2020-12-29 21:22:36 +00:00
kwin-runner-windows.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-02-10 08:21:09 +01:00
main.cpp
metadata.json
org.kde.krunner1.xml
windowsrunnerinterface.cpp	KRunner integration: Send window pixmap along	2020-12-29 21:22:36 +00:00
windowsrunnerinterface.h