Merge branch 'mplamann' into run_vm

Conflicts:
	public/vm/index.js
This commit is contained in:
2015-04-13 23:15:38 -04:00
52 changed files with 1262 additions and 32 deletions

View File

@@ -20,11 +20,13 @@ callbacks = {};
callbacks[c0ffi.NATIVE_PRINT] = function(args) {
print(args[0]);
print("<br />");
return 0;
}
callbacks[c0ffi.NATIVE_PRINTINT] = function(args) {
print(args[0]);
print("<br />");
return 0;
}
console.log(callbacks);