Tomasz Drwięga a0db1d5416 Merge branch 'master' into rustfmt ... Conflicts: ethash/src/sizes.rs util/src/uint.rs		2016-03-23 16:55:54 +01:00
..
res	Avoid tracing DELEGATECALL and CALLCODE. Plus tests for it.	2016-03-20 19:20:37 +01:00
src	Merge branch 'master' into rustfmt	2016-03-23 16:55:54 +01:00
Cargo.toml	Merge branch 'master' of github.com:ethcore/parity into ethrpc_test	2016-03-18 18:05:29 +01:00