Joshua Barretto a4b9230f03 fixed Cargo.lock conflict ...

Fixed `crossbeam-queue` being referenced  twice in the lockfile

2021-01-07 20:25:12 +00:00

..

benches

Remove spurious uses of Vox.

2020-09-26 16:30:40 +02:00

net

fixed Cargo.lock conflict

2021-01-07 20:25:12 +00:00

src

fixed Cargo.lock conflict

2021-01-07 20:25:12 +00:00

sys

fixed Cargo.lock conflict

2021-01-07 20:25:12 +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

fixed Cargo.lock conflict

2021-01-07 20:25:12 +00:00