Merge remote-tracking branch 'origin/master' into masterv0.3.3-rc.3

1 files changed, 0 insertions, 43 deletions

diff --git a/hacked-list.txt b/hacked-list.txt
deleted file mode 100644
index 3182b56..0000000
--- a/hacked-list.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-./consensus/dummy/consensus.go
-./consensus/clique/clique.go
-./consensus/consensus.go
-./consensus/ethash/consensus.go
-./core/blockchain.go
-./core/events.go
-./core/evm.go
-./core/genesis.go
-./core/gen_genesis_account.go
-./core/gen_genesis.go
-./core/rawdb/accessors_chain.go
-./core/state/journal.go
-./core/state_processor.go
-./core/state/statedb.go
-./core/state/state_object.go
-./core/tx_pool.go
-./core/types/block.go
-./core/vm/errors.go
-./core/vm/evm.go
-./core/vm/instructions.go
-./core/vm/interface.go
-./core/vm/interpreter.go
-./core/vm/jump_table.go
-./core/vm/memory_table.go
-./core/vm/opcodes.go
-./eth/api_backend.go
-./eth/api.go
-./eth/api_tracer.go
-./eth/backend.go
-./eth/config.go
-./eth/gen_config.go
-./eth/tracers/internal/tracers/assets.go
-./internal/ethapi/api.go
-./internal/ethapi/backend.go
-./miner/miner.go
-./miner/worker.go
-./node/api.go
-./node/config.go
-./node/node.go
-./node/service.go
-./params/protocol_params.go
-./rpc/client.go
-./rpc/types.go