Commit Graph

6 Commits

Author SHA1 Message Date
Nikolay Volf
efc70e9f09 merge fix 2016-01-31 19:04:47 +04:00
Nikolay Volf
b83dd9fe52 fix merge bug 2016-01-31 19:01:43 +04:00
Nikolay Volf
5837b6e131 Merge branch 'master' into coverage-effort
Conflicts:
	ethcore/res/ethereum/tests
2016-01-31 18:40:59 +04:00
debris
02f5004161 moving around dirs 2016-01-31 11:08:04 +01:00
debris
87edeae078 fixed tests submodule branch 2016-01-28 11:21:06 +01:00
Gav Wood
7634d60a97 Add tests module, add two more transaction tests. 2016-01-12 12:22:18 +01:00