Commit Graph

2157 Commits

Author SHA1 Message Date
debris
1a69b3861d make json tests optional 2016-01-31 20:14:27 +01:00
Nikolay Volf
f2a109684e remove directory 2016-01-31 19:35:17 +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
00db35457c comment out failing tests 2016-01-31 12:54:31 +01:00
debris
e379592a1a Merge branch 'move' into travis_move 2016-01-31 12:45:17 +01:00
debris
02f5004161 moving around dirs 2016-01-31 11:08:04 +01:00
debris
8fe0d74b64 moved src to ethcore 2016-01-31 10:36:48 +01:00