Schmappie Eldress 7871b44824 Merge branch 'dragonfire/master' into waspsaliva
This merge removes some redundant-looking code that was apparently
included in DFC upstream already.

This merge also reverts some whitespace & reformatting changes in the
`src/` directory so that a `git diff dragonfire/master` contains only
the essential differences.
2021-08-17 01:48:45 -05:00
..