Tomasz Drwięga 8b84b4f128 Merge branch 'master' into rpc-shared-miner ... Conflicts: parity/main.rs		2016-04-22 12:16:15 +02:00
..
rpctest	improvements to build, updated dependencies, moved rpctest to its own submodule	2016-03-19 23:27:50 +01:00
src	Merge branch 'master' into rpc-shared-miner	2016-04-22 12:16:15 +02:00
Cargo.toml	Bumping clippy version	2016-04-12 13:51:39 +02:00
build.rs	Removing superflous check for nightly	2016-03-11 11:16:49 +01:00