Tomasz Drwięga 6bbaced3cd Merge branch 'master' into miner-no-default ... Conflicts: ethcore/src/miner/miner.rs parity/main.rs		2016-06-26 22:44:34 +02:00
..
hypervisor	Fixing warnings	2016-06-03 11:36:30 +02:00
cli.rs	Don't mine without --author (#1436)	2016-06-26 22:02:17 +02:00
configuration.rs	Don't mine without --author (#1436)	2016-06-26 22:02:17 +02:00
dapps.rs	Fixing interface and port for parity ui	2016-06-24 12:10:36 +02:00
die.rs
informant.rs
io_handler.rs	Fixing warnings	2016-06-20 15:20:55 +02:00
main.rs	Merge branch 'master' into miner-no-default	2016-06-26 22:44:34 +02:00
migration.rs	fixed migration of empty pruning dir	2016-06-20 22:35:59 +02:00
price_info.rs
rpc_apis.rs	Signer with Unlocked Account (#1398)	2016-06-22 21:32:26 +02:00
rpc.rs	Fixing interface and port for parity ui	2016-06-24 12:10:36 +02:00
setup_log.rs
signer.rs	Minor typo.	2016-06-19 12:29:39 +02:00
upgrade.rs
url.rs	Changing macos impl	2016-06-24 12:30:54 +02:00