Merge remote-tracking branch 'upstream/master'

Merging with latest upstream, resolving simple .toml conflict

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "cpal"
-version = "0.0.12-pre"
+version = "0.0.13"
 authors = ["Pierre Krieger <pierre.krieger1708@gmail.com>"]
 description = "Cross-platform audio playing library in pure Rust."
 repository = "https://github.com/tomaka/cpal"
@@ -9,6 +9,9 @@ documentation = "http://tomaka.github.io/cpal/"
 license = "Apache-2.0"
 keywords = ["audio", "sound"]
 
+[dependencies]
+libc = "*"
+
 [target.i686-pc-windows-gnu.dependencies.winapi]
 version = "0"
 

alsa-sys/Cargo.toml

@@ -1,11 +1,14 @@
 [package]
 
 name = "alsa-sys"
-version = "0.0.2"
+version = "0.0.3"
 authors = ["Pierre Krieger <pierre.krieger1708@gmail.com>"]
 build = "build.rs"
 description = "Bindings for the ALSA project (Advanced Linux Sound Architecture)"
 license = "MIT"
 
+[dependencies]
+libc = "*"
+
 [build-dependencies]
 pkg-config = "^0.1.1"