Samuel Keiffer 1374900928 Merge branch 'sam/combat-fixes' into 'master' ... Fixes gaining combo by shooting loot bag See merge request veloren/veloren!1953		2021-03-22 02:01:22 +00:00
..
base	Change the version number to 0.9	2021-03-20 13:07:09 +01:00
benches	Remove spurious uses of Vox.	2020-09-26 16:30:40 +02:00
ecs	Change the version number to 0.9	2021-03-20 13:07:09 +01:00
net	Change the version number to 0.9	2021-03-20 13:07:09 +01:00
src	Merge branch 'sam/combat-fixes' into 'master'	2021-03-22 02:01:22 +00:00
sys	Merge branch 'sam/combat-fixes' into 'master'	2021-03-22 02:01:22 +00:00
build.rs	fix and improve nix build: actually output a proper veloren voxygen package now	2020-11-25 02:00:50 +03:00
Cargo.toml	Change the version number to 0.9	2021-03-20 13:07:09 +01:00