Merge branch 'vendor/FILE'
authorAntonio Huete Jimenez <tuxillo@quantumachine.net>
Sat, 12 Nov 2022 17:40:03 +0000 (18:40 +0100)
committerAntonio Huete Jimenez <tuxillo@quantumachine.net>
Sat, 12 Nov 2022 17:40:03 +0000 (18:40 +0100)
commit739f0ef867128a933e021db3d831e906fcafd825
tree9c1bb115d0be62fa0460c78cc803c2ade4ceb3b5
parent60a39bf65d0c6450dcfe7ccd796660cb962fbbfc
parent3b9cdfa3509db0e99d1e047a4f154fb0b0732d85
Merge branch 'vendor/FILE'

Conflicts:
contrib/file/src/file.h
contrib/file/src/softmagic.c