obscuren 64f35ba8d1 merge errors fixed

2014-12-02 11:52:56 +01:00

..

config.go

Implemented new miner w/ ui interface for merged mining. Closes #177

2014-11-07 12:18:48 +01:00

hexface.go

merge errors fixed

2014-12-02 11:52:56 +01:00

js_types.go

Begin of moving objects to types package

2014-11-18 16:58:22 +01:00

object.go

ethstate => state

2014-10-31 14:43:14 +01:00

pipe.go

merge errors fixed

2014-12-02 11:52:56 +01:00

vm_env.go

Begin of moving objects to types package

2014-11-18 16:58:22 +01:00

world.go

StateManager => BlockManager

2014-11-04 10:57:02 +01:00