merge errors fixed

2014-12-02 11:52:56 +01:00
parent 616066a598 99481a245a
commit 64f35ba8d1
38 changed files with 9811 additions and 579 deletions
--- a/vm/execution.go
+++ b/vm/execution.go
@ -69,6 +69,7 @@ func (self *Execution) exec(code, caddr []byte, caller ClosureRef) (ret []byte,
 			if self.Gas.Cmp(p.Gas) >= 0 {
 				ret = p.Call(self.input)
 				self.vm.Printf("NATIVE_FUNC(%x) => %x", naddr, ret)
+				self.vm.Endl()
 			}
 		} else {
 			// Create a new callable closure