Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'desttinghim/update-cpal' into 'master'

Browse Source 
Move to latest version of cpal

See merge request veloren/veloren!202
This commit is contained in:
Forest Anderson 2019-05-31 19:47:08 +00:00
commit 3ffe556905
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@ -2100,7 +2100,7 @@ dependencies = [
[[package]]
name = "rodio"
version = "0.8.1"
source = "git+https://github.com/desttinghim/rodio.git#3d95bc859b56b7f07eecedee96bf79205729a0e2"
source = "git+https://github.com/desttinghim/rodio.git?rev=3d95bc859b56b7f07eecedee96bf79205729a0e2#3d95bc859b56b7f07eecedee96bf79205729a0e2"
dependencies = [
"cgmath 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
"claxon 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2625,7 +2625,7 @@ dependencies = [
"num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"portpicker 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
"rodio 0.8.1 (git+https://github.com/desttinghim/rodio.git)",
"rodio 0.8.1 (git+https://github.com/desttinghim/rodio.git?rev=3d95bc859b56b7f07eecedee96bf79205729a0e2)",
"ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3071,7 +3071,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8f0a0bcab2fd7d1d7c54fa9eae6f43eddeb9ce2e7352f8518a814a4f65d60c58"
"checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7"
"checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96"
"checksum rodio 0.8.1 (git+https://github.com/desttinghim/rodio.git)" = "<none>"
"checksum rodio 0.8.1 (git+https://github.com/desttinghim/rodio.git?rev=3d95bc859b56b7f07eecedee96bf79205729a0e2)" = "<none>"
"checksum ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ece421e0c4129b90e4a35b6f625e472e96c552136f5093a2f4fa2bbb75a62d5"
"checksum rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "ccc78bfd5acd7bf3e89cffcf899e5cb1a52d6fafa8dec2739ad70c9577a57288"
"checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"

2
voxygen/Cargo.toml
View File

@ -28,7 +28,7 @@ conrod_winit = { git = "https://gitlab.com/veloren/conrod.git" }
euc = "0.2"
# Audio
rodio = { git = "https://github.com/desttinghim/rodio.git" }
rodio = { git = "https://github.com/desttinghim/rodio.git", rev = "3d95bc859b56b7f07eecedee96bf79205729a0e2" }
# ECS
specs = "0.14"