Merge branch 'v0.6.x'

# Conflicts:
#	serde/src/de/mod.rs
#	serde_codegen/src/attr.rs
#	serde_codegen/src/de.rs
#	serde_codegen/src/lib.rs
This commit is contained in:
Erick Tryzelaar
2016-02-12 21:43:23 -08:00
9 changed files with 58 additions and 57 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
[package]
name = "serde"
version = "0.6.11"
version = "0.6.12"
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
license = "MIT/Apache-2.0"
description = "A generic serialization/deserialization framework"
@@ -17,5 +17,5 @@ num-impls = ["num-bigint", "num-complex", "num-rational"]
num-rational = ["num/rational"]
[dependencies]
clippy = { version = "^0.0.37", optional = true }
clippy = { version = "^0.0.39", optional = true }
num = { version = "^0.1.27", default-features = false }