openethereum/parity
Tomasz Drwięga 555555e6f7 Merge branch 'master' into signer-wsnotification
Conflicts:
	parity/signer.rs
	rpc/src/v1/helpers/signing_queue.rs
	rpc/src/v1/impls/eth_signing.rs
	rpc/src/v1/impls/personal_signer.rs
	signer/src/ws_server/mod.rs
2016-06-01 20:00:43 +02:00
..
hypervisor Fixing clippy warnings 2016-05-17 10:32:05 +02:00
cli.rs Disabling ethcore APIs for RPC and IPC 2016-05-31 21:53:20 +02:00
configuration.rs Bumping clippy. Fixing warnings (#1139) 2016-05-25 17:03:58 +02:00
dapps.rs Simple signing queue, confirmation APIs exposed in signer WebSockets. (#1182) 2016-06-01 19:37:34 +02:00
die.rs trace error in die_with_io_error 2016-05-22 12:48:40 -04:00
informant.rs Fixing clippy warnings 2016-05-26 11:49:58 +02:00
io_handler.rs Display progress when importing (#1136) 2016-05-25 09:57:31 +02:00
main.rs Simple signing queue, confirmation APIs exposed in signer WebSockets. (#1182) 2016-06-01 19:37:34 +02:00
migration.rs Fixing few clippy warnings 2016-05-27 17:56:25 +02:00
price_info.rs Fixing clippy warnings 2016-05-17 10:32:05 +02:00
rpc_apis.rs Simple signing queue, confirmation APIs exposed in signer WebSockets. (#1182) 2016-06-01 19:37:34 +02:00
rpc.rs Simple signing queue, confirmation APIs exposed in signer WebSockets. (#1182) 2016-06-01 19:37:34 +02:00
setup_log.rs Base for Signer Websockets server (#1158) 2016-05-28 19:30:31 +02:00
signer.rs Simple signing queue, confirmation APIs exposed in signer WebSockets. (#1182) 2016-06-01 19:37:34 +02:00
upgrade.rs Fixing clippy warnings 2016-05-17 10:32:05 +02:00