Merge remote-tracking branch 'upstream/develop' into develop

ethereum · Oct 6, 2014 · e17a909 · e17a909
2 parents 33fcab5 + 25f9fd5
commit e17a909
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 152 deletions.
diff --git a/tmp.json b/tmp.json
diff --git a/random.json → vmtests/random.json b/random.json → vmtests/random.json
diff --git a/vmArithmeticTest.json → vmtests/vmArithmeticTest.json b/vmArithmeticTest.json → vmtests/vmArithmeticTest.json
diff --git a/vmBitwiseLogicOperationTest.json → vmtests/vmBitwiseLogicOperationTest.json b/vmBitwiseLogicOperationTest.json → vmtests/vmBitwiseLogicOperationTest.json
diff --git a/vmBlockInfoTest.json → vmtests/vmBlockInfoTest.json b/vmBlockInfoTest.json → vmtests/vmBlockInfoTest.json
diff --git a/vmEnvironmentalInfoTest.json → vmtests/vmEnvironmentalInfoTest.json b/vmEnvironmentalInfoTest.json → vmtests/vmEnvironmentalInfoTest.json
diff --git a/vmIOandFlowOperationsTest.json → vmtests/vmIOandFlowOperationsTest.json b/vmIOandFlowOperationsTest.json → vmtests/vmIOandFlowOperationsTest.json
diff --git a/vmPushDupSwapTest.json → vmtests/vmPushDupSwapTest.json b/vmPushDupSwapTest.json → vmtests/vmPushDupSwapTest.json
diff --git a/vmSha3Test.json → vmtests/vmSha3Test.json b/vmSha3Test.json → vmtests/vmSha3Test.json
diff --git a/vmSystemOperationsTest.json → vmtests/vmSystemOperationsTest.json b/vmSystemOperationsTest.json → vmtests/vmSystemOperationsTest.json
diff --git a/vmtests.json → vmtests/vmtests.json b/vmtests.json → vmtests/vmtests.json