Tomasz Drwięga 8b84b4f128 Merge branch 'master' into rpc-shared-miner ...

Conflicts:
	parity/main.rs

2016-04-22 12:16:15 +02:00

..

hypervisor

Getting rid of generated code warnings

2016-04-21 16:32:44 +02:00

cli.rs

Separating

2016-04-21 15:41:25 +02:00

configuration.rs

Additional RPC methods for settings

2016-04-21 19:24:10 +02:00

die.rs

Separating RPC

2016-04-21 13:12:43 +02:00

informant.rs

Splitting informant,io_handler and webapps

2016-04-21 13:57:27 +02:00

io_handler.rs

Splitting informant,io_handler and webapps

2016-04-21 13:57:27 +02:00

main.rs

Merge branch 'master' into rpc-shared-miner

2016-04-22 12:16:15 +02:00

price_info.rs

Separating

2016-04-21 15:41:25 +02:00

rpc.rs

Merge branch 'master' into rpc-shared-miner

2016-04-22 12:16:15 +02:00

setup_log.rs

Splitting Configuration to separate module

2016-04-21 16:45:07 +02:00

upgrade.rs

Fixing warnings

2016-04-21 16:06:54 +02:00

webapp.rs

Merge branch 'master' into rpc-shared-miner

2016-04-22 12:16:15 +02:00