l10n daemon script a7a5a3f003 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-04 05:36:25 +01:00
..
CMakeLists.txt	Centralise startup code in this repository	2019-11-19 15:01:32 +01:00
kwinwrapper	Don't apply un-needed workaround	2019-11-22 14:44:11 +05:30
plasma-mobile.desktop.cmake	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-12-04 05:36:25 +01:00
plasma-phone.cmake	startup: set PLASMA_PLATFORM to phone:handset	2019-07-16 20:09:47 +05:30