Justin Shipsey f050aeb273 Merge branch 'master' into 'slipped/swim' ... # Conflicts: # voxygen/src/anim/src/character/swim.rs		2020-08-09 15:13:56 +00:00
..
benches	Suppressed all existing clippy warnings in preparation for fixes as part of #587	2020-06-10 22:01:42 +01:00
examples	Fix issue where client_init was not set to None after it finished, use tweaked version of winit to avoid macos link failure in the CI, small comment fixes	2020-07-17 21:26:21 -04:00
src	Merge branch 'master' into 'slipped/swim'	2020-08-09 15:13:56 +00:00
build.rs	feat(voxygen): add logo for windows executable	2019-10-02 16:57:08 +02:00
Cargo.toml	update auth to the newest version and remove useless dep	2020-07-29 00:05:23 +02:00