102 commits

Author	SHA1	Message	Date
l10n daemon script	fd1fbcbea4	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-07-06 05:12:35 +02:00
Aleix Pol	a40c6e8101	Submitted proof of concept for a presenter plugin ... Will show a cursor so we can point at interesting things on the screen during presentations.	2019-07-05 17:58:46 +02:00