Joshua Yanovski 862df3c997 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes		2020-08-13 05:52:56 +02:00
..
benches	Merge remote-tracking branch 'origin/master' into sharp/small-fixes	2020-07-04 16:17:40 +02:00
examples	Merge remote-tracking branch 'origin/master' into sharp/small-fixes	2020-07-27 13:16:27 +02:00
src	Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes	2020-08-13 05:52:56 +02:00
build.rs	feat(voxygen): add logo for windows executable	2019-10-02 16:57:08 +02:00
Cargo.toml	Merge remote-tracking branch 'origin/master' into sharp/small-fixes	2020-08-12 16:32:24 +02:00
clippy.toml	Add clippy.toml.	2020-08-07 13:23:10 +02:00