Merge branch 'dev' into control-flow-flattening

# Conflicts:
#	dist/index.js
#	src/custom-nodes/node-calls-controller-nodes/NodeCallsControllerFunctionNode.ts
#	src/custom-nodes/self-defending-nodes/SelfDefendingUnicodeNode.ts
#	src/custom-nodes/string-array-nodes/StringArrayCallsWrapper.ts
#	src/custom-nodes/string-array-nodes/StringArrayRotateFunctionNode.ts
This commit is contained in:
sanex3339
2016-11-22 00:52:32 +03:00
22 changed files with 129 additions and 30 deletions
@@ -93,7 +93,9 @@ export class StringArrayRotateFunctionNode extends AbstractCustomNode {
stringArrayRotateValue: Utils.decToHex(this.stringArrayRotateValue),
whileFunctionName
}),
NO_CUSTOM_NODES_PRESET
Object.assign({}, NO_CUSTOM_NODES_PRESET, {
seed: this.options.seed
})
).getObfuscatedCode();
}
}