Merge remote-tracking branch 'upstream/master'
Merging with latest upstream, resolving simple .toml conflict
This commit is contained in:
commit
b8b81e84f6
|
@ -1,7 +1,7 @@
|
||||||
[package]
|
[package]
|
||||||
|
|
||||||
name = "cpal"
|
name = "cpal"
|
||||||
version = "0.0.12-pre"
|
version = "0.0.13"
|
||||||
authors = ["Pierre Krieger <pierre.krieger1708@gmail.com>"]
|
authors = ["Pierre Krieger <pierre.krieger1708@gmail.com>"]
|
||||||
description = "Cross-platform audio playing library in pure Rust."
|
description = "Cross-platform audio playing library in pure Rust."
|
||||||
repository = "https://github.com/tomaka/cpal"
|
repository = "https://github.com/tomaka/cpal"
|
||||||
|
@ -9,6 +9,9 @@ documentation = "http://tomaka.github.io/cpal/"
|
||||||
license = "Apache-2.0"
|
license = "Apache-2.0"
|
||||||
keywords = ["audio", "sound"]
|
keywords = ["audio", "sound"]
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
libc = "*"
|
||||||
|
|
||||||
[target.i686-pc-windows-gnu.dependencies.winapi]
|
[target.i686-pc-windows-gnu.dependencies.winapi]
|
||||||
version = "0"
|
version = "0"
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,14 @@
|
||||||
[package]
|
[package]
|
||||||
|
|
||||||
name = "alsa-sys"
|
name = "alsa-sys"
|
||||||
version = "0.0.2"
|
version = "0.0.3"
|
||||||
authors = ["Pierre Krieger <pierre.krieger1708@gmail.com>"]
|
authors = ["Pierre Krieger <pierre.krieger1708@gmail.com>"]
|
||||||
build = "build.rs"
|
build = "build.rs"
|
||||||
description = "Bindings for the ALSA project (Advanced Linux Sound Architecture)"
|
description = "Bindings for the ALSA project (Advanced Linux Sound Architecture)"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
libc = "*"
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
pkg-config = "^0.1.1"
|
pkg-config = "^0.1.1"
|
||||||
|
|
7325
alsa-sys/src/lib.rs
7325
alsa-sys/src/lib.rs
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue