Olaf Meeuwissen bfea8a1a82 Merge branch 'master' into 'release/1.0.30' ... # Conflicts: # NEWS		2020-05-18 12:08:28 +00:00
..
sane	Merge branch 'master' into 'release/1.0.30'	2020-05-18 12:08:28 +00:00
.gitignore	…
Makefile.am	…
font_6x11.h	…
lalloca.h	…
lassert.h	…
lgetopt.h	…
md5.h	…