Merge branch 'vendor/BMAKE'
authorAntonio Huete Jimenez <tuxillo@quantumachine.net>
Wed, 9 Nov 2022 13:52:46 +0000 (14:52 +0100)
committerAntonio Huete Jimenez <tuxillo@quantumachine.net>
Wed, 9 Nov 2022 13:52:46 +0000 (14:52 +0100)
commit9e7ae5a0527a977cab412aede3a532cfe2903bbb
tree914574aa8cd182432eebaf54b628f8baacc133b2
parent1176aeedca1e80122a2e4dce426d626d1cef6acd
parent6eef5f0c4fcdca6bfaf703d2e142acf41491a269
Merge branch 'vendor/BMAKE'

Conflicts:
contrib/bmake/main.c
contrib/bmake/make.1
contrib/bmake/meta.c
contrib/bmake/bmake.1
contrib/bmake/main.c
contrib/bmake/make.1
contrib/bmake/meta.c
contrib/bmake/mk/mk-files.txt