Merge branch 'maint-0.3.4' into maint-0.3.5

Browse Source

"ours" merge to ignore the changes to src/common/compat.c,
they have already been merged to 0.3.5 in the correct file.

...

This commit is contained in:

teor 2019-03-14 06:59:09 +10:00

parent ffd7207025 e021f89f36

commit 5d41e2223f

No known key found for this signature in database

GPG Key ID: 10FEAA0E7075672A

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available