Merge branch 'v0.6.x' into master

# Conflicts:
#	serde_codegen/Cargo.toml
This commit is contained in:
Erick Tryzelaar committed 2015-12-08 09:50:10 -05:00
commit 188425ffe5
11 files changed
+205 -8

No files matched your search

+3 -3
View File
@@ -19,8 +19,8 @@ quasi_codegen = { version = "^0.3.9", optional = true }
syntex = { version = "^0.22.0", optional = true }
[dependencies]
aster = { version = "^0.8.0", default-features = false }
quasi = { version = "^0.3.8", default-features = false }
aster = { version = "^0.9.0", default-features = false }
quasi = { version = "^0.3.9", default-features = false }
quasi_macros = { version = "^0.3.9", optional = true }
syntex = { version = "^0.22.0", optional = true }
syntex_syntax = { version = "^0.22.0", optional = true }
syntex_syntax = { version = "^0.23.0", optional = true }