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

This commit is contained in:
Christoph Jentzsch 2014-11-11 08:34:36 +01:00
commit 6e0310c1ea

@ -7,10 +7,6 @@ module.exports = {
trietest: require('./TrieTests/trietest'), trietest: require('./TrieTests/trietest'),
trietestnextprev: require('./TrieTests/trietestnextprev'), trietestnextprev: require('./TrieTests/trietestnextprev'),
txtest: require('./BasicTests/txtest'), txtest: require('./BasicTests/txtest'),
randomTests: {
201410211705: require('./randomTests/201410211705'),
201410211708: require('./randomTests/201410211708')
},
StateTests: { StateTests: {
stPreCompiledContracts: require('./StateTests/stPreCompiledContracts'), stPreCompiledContracts: require('./StateTests/stPreCompiledContracts'),
stSystemOperationsTest: require('./StateTests/stSystemOperationsTest'), stSystemOperationsTest: require('./StateTests/stSystemOperationsTest'),