2 commits

Author	SHA1	Message	Date
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
Aleix Pol	f0f01e82e6	Centralise startup code in this repository ... Have it start through the session file that the display manager should be starting.	2019-11-19 15:01:32 +01:00