shift-shell/bin
l10n daemon script 6677d9a887 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-07-31 05:43:20 +02:00
..
CMakeLists.txt Use KDEInstallDirs to insert paths into kwinwrapper 2019-12-10 14:26:03 +00:00
kwinwrapper.in Use KDEInstallDirs to insert paths into kwinwrapper 2019-12-10 14:26:03 +00:00
plasma-mobile.desktop.cmake SVN_SILENT made messages (.desktop file) - always resolve ours 2020-07-31 05:43:20 +02:00