Schmappie Eldress f2bd219041 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-28 23:30:54 -05:00
..
2020-10-04 03:37:08 +02:00
2021-04-09 22:34:18 +02:00