Commit Graph
5 Commits
Author SHA1 Message Date
Paweł Bylica 3ba2d4195f Merge remote-tracking branch 'origin/vm' into develop-evmcc
Conflicts:
	libethereum/Executive.cpp
	libethereum/Executive.h
	libethereum/State.cpp
	libevm/VM.cpp
	libevm/VM.h
	libevm/VMFace.h
	test/createRandomTest.cpp
	test/vm.cpp
	windows/LibEthereum.vcxproj.filters
2014-12-10 23:42:01 +01:00
Paweł Bylica 1d85b074c8 Merge remote-tracking branch 'upstream/develop' into vm 2014-12-10 17:44:10 +01:00
Paweł Bylica c1ffbbe797 VMFactory - a new way of creating VMs 2014-12-10 17:41:53 +01:00
Paweł Bylica 475ce376eb Merge branch 'develop-evmcc' into pr-jit 2014-11-26 20:21:41 +01:00
Paweł Bylica a5d0496ea4 Merge branch 'develop' into develop-evmcc
Conflicts:
	libevm/VM.h
	test/vm.cpp
2014-11-26 20:20:52 +01:00