2 Commits

Author	SHA1	Message	Date
l10n daemon script	a787d1a21d	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"	2020-10-25 05:12:30 +01:00
Black Hat	2defc5a134	Revert "Embed cmark." ... This reverts commit f35001112dc740ed827e4a4de6e4bb3d94b0e466	2019-07-20 11:13:09 +00:00