kwin/runners
l10n daemon script 7659261982 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-11-16 06:14:08 +01:00
..
dbusutils_p.h Add windows runner 2020-10-30 10:30:53 +00:00
kwin-runner-windows.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-11-16 06:14:08 +01:00
org.kde.krunner1.xml Add windows runner 2020-10-30 10:30:53 +00:00
windowsrunnerinterface.cpp Add windows runner 2020-10-30 10:30:53 +00:00
windowsrunnerinterface.h Add windows runner 2020-10-30 10:30:53 +00:00