shift-shell/bin
l10n daemon script 6fd1d0184e 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"
2019-12-31 05:45:46 +01: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 2019-12-31 05:45:46 +01:00