grassrootseconomics
/
openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into syntex-lib-update 

Conflicts:
	Cargo.lock
This commit is contained in:
Nikolay Volf 2016-05-07 18:23:01 +04:00
parent 0d642f3109 5bf047825f
commit da6a8b98e2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.lock generated
View File

@ -354,7 +354,7 @@ dependencies = [
"clippy 0.0.64 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-rpc 1.2.0",
"ethcore-util 1.2.0",
"hyper 0.9.2 (git+https://github.com/hyperium/hyper?branch=mio)",
"hyper 0.9.3 (git+https://github.com/hyperium/hyper?branch=mio)",
"jsonrpc-core 2.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"jsonrpc-http-server 5.1.0 (git+https://github.com/ethcore/jsonrpc-http-server.git)",
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -489,8 +489,8 @@ dependencies = [
[[package]]
name = "hyper"
version = "0.9.2"
source = "git+https://github.com/hyperium/hyper?branch=mio#11930b61857e15830d558303ba5e77f6c02d06fd"
version = "0.9.3"
source = "git+https://github.com/hyperium/hyper?branch=mio#dbb4cf160ebf242f7f0459d547c40e9e6877ccf4"
dependencies = [
"cookie 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -571,7 +571,7 @@ name = "jsonrpc-http-server"
version = "5.1.0"
source = "git+https://github.com/ethcore/jsonrpc-http-server.git#b32815330c191aff06a6e017ba00c10e872bb4f6"
dependencies = [
"hyper 0.9.2 (git+https://github.com/hyperium/hyper?branch=mio)",
"hyper 0.9.3 (git+https://github.com/hyperium/hyper?branch=mio)",
"jsonrpc-core 2.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
]