Merge remote-tracking branch 'remotes/origin/v0.6.x'

# Conflicts:
#	serde_codegen/Cargo.toml
This commit is contained in:
Erick Tryzelaar
2015-11-28 21:16:51 -08:00
13 changed files with 112 additions and 18 deletions
+3 -3
View File
@@ -11,15 +11,15 @@ keywords = ["serialization"]
build = "build.rs"
[build-dependencies]
syntex = { version = "^0.17.0" }
syntex_syntax = { version = "^0.19.1" }
syntex = { version = "^0.22.0" }
syntex_syntax = { version = "^0.22.0" }
serde_codegen = { version = "*", path = "../serde_codegen", features = ["with-syntex"] }
[dev-dependencies]
num = "^0.1.27"
rustc-serialize = "^0.3.16"
serde = { version = "*", path = "../serde" }
syntex = "^0.17.0"
syntex = "^0.22.0"
[[test]]
name = "test"