Jaco Greeff 7bbd48a2bd Merge branch 'master' into ui-2 ... # Conflicts: # js/package.json # js/src/api/local/ethkey/worker.js # js/src/modals/FirstRun/TnC/tnc.js # js/src/modals/FirstRun/Welcome/welcome.js # js/src/ui/Form/Input/input.js # js/src/ui/VaultCard/Accounts/accounts.spec.js # js/src/views/Accounts/accounts.js # js/src/views/Application/TabBar/tabBar.js # js/src/views/Settings/Views/defaults.js # js/src/views/Settings/Views/views.js # js/webpack/app.js # js/webpack/libraries.js		2017-06-13 11:02:38 +02:00
..
account_provider	Blacklist empty phrase account. (#5730)	2017-06-07 11:34:53 +02:00
blockchain	Create an account for chain=dev (#5612)	2017-05-19 17:06:36 +02:00
blooms	rlp deserialization refactor, 30% faster (#4901)	2017-03-22 14:41:46 +01:00
client	EIP-211 RETURNDATACOPY and RETURNDATASIZE (#5678)	2017-06-06 18:47:12 +03:00
engines	Merge branch 'master' into ui-2	2017-06-13 11:02:38 +02:00
ethereum	Merge branch 'master' into ui-2	2017-06-13 11:02:38 +02:00
evm	Merge branch 'master' into ui-2	2017-06-13 11:02:38 +02:00
json_tests	EIP-211 RETURNDATACOPY and RETURNDATASIZE (#5678)	2017-06-06 18:47:12 +03:00
migrations	store epoch transition proofs in DB	2017-04-19 14:58:19 +02:00
miner	EIP-210 BLOCKHASH changes (#5505)	2017-05-30 11:52:33 +02:00
snapshot	EIP-210 BLOCKHASH changes (#5505)	2017-05-30 11:52:33 +02:00
spec	EIP-211 RETURNDATACOPY and RETURNDATASIZE (#5678)	2017-06-06 18:47:12 +03:00
state	EIP-210 BLOCKHASH changes (#5505)	2017-05-30 11:52:33 +02:00
tests	EIP-210 BLOCKHASH changes (#5505)	2017-05-30 11:52:33 +02:00
trace	Merge branch 'master' into ui-2	2017-06-13 11:02:38 +02:00
types	EIP-210 BLOCKHASH changes (#5505)	2017-05-30 11:52:33 +02:00
verification	verify_external in verifier trait	2017-04-13 20:34:16 +02:00
views	rlp deserialization refactor, 30% faster (#4901)	2017-03-22 14:41:46 +01:00
account_db.rs	use NULL_RLP, remove NULL_RLP_STATIC (#5742)	2017-06-07 11:58:39 +02:00
action_params.rs	Update dependencies and bigint api (#5685)	2017-05-24 12:31:33 +02:00
basic_types.rs	Fix whitespace (#4299)	2017-01-25 18:51:41 +01:00
block.rs	EIP-210 BLOCKHASH changes (#5505)	2017-05-30 11:52:33 +02:00
builtin.rs	Update dependencies and bigint api (#5685)	2017-05-24 12:31:33 +02:00
cache_manager.rs	Fix whitespace (#4299)	2017-01-25 18:51:41 +01:00
db.rs	use a database in ethcore-light	2017-03-21 20:57:13 +01:00
env_info.rs	Remote transaction execution (#4684)	2017-03-08 14:39:44 +01:00
error.rs	PoA warp implementation (#5488)	2017-05-17 12:41:33 +02:00
executive.rs	Merge branch 'master' into ui-2	2017-06-13 11:02:38 +02:00
externalities.rs	Merge branch 'master' into ui-2	2017-06-13 11:02:38 +02:00
factory.rs	Fix whitespace (#4299)	2017-01-25 18:51:41 +01:00
header.rs	tests for on_demand	2017-04-07 19:35:39 +02:00
lib.rs	fix the doc of installing rust	2017-05-10 17:13:40 +08:00
pod_account.rs	Calculate post-constructors state root in spec at load time (#5523)	2017-05-03 09:00:02 +02:00
pod_state.rs	Fix whitespace (#4299)	2017-01-25 18:51:41 +01:00
service.rs	Save pending local transactions in the database (#4566)	2017-02-20 17:21:55 +01:00
state_db.rs	Calculate post-constructors state root in spec at load time (#5523)	2017-05-03 09:00:02 +02:00