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

This commit is contained in:
Christoph Jentzsch 2014-11-19 10:00:24 +01:00
commit d84be4fe07

View File

@ -9,6 +9,7 @@ module.exports = {
txtest: require('./BasicTests/txtest'), txtest: require('./BasicTests/txtest'),
StateTests: { StateTests: {
stPreCompiledContracts: require('./StateTests/stPreCompiledContracts'), stPreCompiledContracts: require('./StateTests/stPreCompiledContracts'),
stRecursiveCreate: require('./StateTests/stRecursiveCreate'),
stSystemOperationsTest: require('./StateTests/stSystemOperationsTest'), stSystemOperationsTest: require('./StateTests/stSystemOperationsTest'),
}, },
VMTests: { VMTests: {