shift-shell/bin
l10n daemon script 42bf272681 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"
2023-04-19 02:38:31 +00:00
..
CMakeLists.txt bin: Add development session support 2022-06-27 12:42:19 -04:00
install-sessions.sh.cmake bin: Add development session support 2022-06-27 12:42:19 -04:00
plasma-mobile-dev.desktop.cmake SVN_SILENT made messages (.desktop file) - always resolve ours 2023-04-19 02:38:31 +00:00
plasma-mobile.desktop.cmake SVN_SILENT made messages (.desktop file) - always resolve ours 2023-04-19 02:38:31 +00:00
startplasmamobile-dev.sh.cmake bin: Add development session support 2022-06-27 12:42:19 -04:00
startplasmamobile.in kded: Don't turn off kdecoration 2023-03-06 21:28:56 -08:00