Merge branch 'master' of github.com:ethcore/parity into rustbeta

This commit is contained in:
debris
2016-02-19 12:40:30 +01:00
4 changed files with 24 additions and 25 deletions

View File

@@ -22,7 +22,7 @@ rustc-serialize = "0.3"
serde_macros = { version = "0.6.13", optional = true }
[build-dependencies]
serde_codegen = { "version" = "0.6.13", "optional" = true }
serde_codegen = { version = "0.6.13", optional = true }
syntex = "0.29.0"
[features]