shift-shell/bin
l10n daemon script 78ce668071 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-11-20 05:40:05 +01:00
..
CMakeLists.txt Centralise startup code in this repository 2019-11-19 15:01:32 +01:00
kwinwrapper Workarounds 2019-11-19 15:01:32 +01:00
plasma-mobile.desktop.cmake SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-20 05:40:05 +01:00
plasma-phone.cmake startup: set PLASMA_PLATFORM to phone:handset 2019-07-16 20:09:47 +05:30