Jaco Greeff d852e6b063 Merge branch 'master' into ui-2 ... # Conflicts: # js/src/views/Signer/components/SignRequest/signRequest.js		2017-10-17 09:55:13 +02:00
..
benches	Fixes bench and removes rustc_serialize dependency (#5988)	2017-10-11 17:39:12 +07:00
evm	Uses dash instead of underscore in crate name	2017-10-16 11:05:54 +07:00
light	Merge branch 'master' into ipc_cleanup	2017-10-16 18:19:41 +02:00
native_contracts	updated ethabi to version 4.0 (#6742)	2017-10-16 10:21:35 +02:00
node_filter	renamed kvdb_memorydb::in_memory -> kvdb_memorydb::create	2017-10-15 16:17:15 +02:00
res	Merge branch 'master' into ui-2	2017-10-16 12:41:41 +02:00
src	fixed failing test	2017-10-16 22:12:17 +02:00
types	remove ipc codegen from ethcore	2017-10-16 17:50:25 +02:00
vm	removed redundant evm deps (#6757)	2017-10-14 19:29:09 +02:00
wasm	WASM gas schedule (#6638)	2017-10-09 13:12:58 +02:00
Cargo.toml	finished removing ipc	2017-10-16 18:18:43 +02:00