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

This commit is contained in:
Christoph Jentzsch 2014-11-06 09:19:53 +01:00
commit c18b8ab2d3

View File

@ -17,7 +17,6 @@ module.exports = {
vmBlockInfoTest: require('./VMTests/vmBlockInfoTest'), vmBlockInfoTest: require('./VMTests/vmBlockInfoTest'),
vmEnvironmentalInfoTest: require('./VMTests/vmEnvironmentalInfoTest'), vmEnvironmentalInfoTest: require('./VMTests/vmEnvironmentalInfoTest'),
vmIOandFlowOperationsTest: require('./VMTests/vmIOandFlowOperationsTest'), vmIOandFlowOperationsTest: require('./VMTests/vmIOandFlowOperationsTest'),
vmNamecoin: require('./VMTests/vmNamecoin'),
vmPushDupSwapTest: require('./VMTests/vmPushDupSwapTest'), vmPushDupSwapTest: require('./VMTests/vmPushDupSwapTest'),
vmSha3Test: require('./VMTests/vmSha3Test'), vmSha3Test: require('./VMTests/vmSha3Test'),
vmtestst: require('./VMTests/vmtests'), vmtestst: require('./VMTests/vmtests'),