Imbris 97148cb6bb Merge branch 'master' into 'combat' ... # Conflicts: # CHANGELOG.md		2020-04-01 20:42:27 +00:00
..
benches	apply new rustfmt - touching alot of files	2020-02-01 21:39:39 +01:00
src	Merge branch 'master' into 'combat'	2020-04-01 20:42:27 +00:00
build.rs	fix(version): more robust version detection	2020-02-09 18:11:40 +01:00
Cargo.toml	Upgrade vek version so that it actually uses the patch	2020-03-30 19:44:51 -04:00