From: Justin Wind <justin.wind@gmail.com>
Date: Fri, 25 May 2012 03:05:40 +0000 (-0700)
Subject: merge
X-Git-Url: http://git.squeep.com/?p=dcpu16;a=commitdiff_plain;h=ee6a49c1c9b11984c67ddee93e15f72ec41e1706

merge
---

ee6a49c1c9b11984c67ddee93e15f72ec41e1706
diff --cc hw_lem1802.c
index c54455d,4cdaa2f..f8004a3
--- a/hw_lem1802.c
+++ b/hw_lem1802.c
@@@ -639,8 -629,6 +639,8 @@@ int lem1802_data_ctl_(struct dcpu16_hw 
  
          *s_out = lem1802_rfb_new_(in->argc, in->argv);
  
-         MSG_DEBUG(hw->vm, "%s>> %s s:%p", __func__, "new_rfbScreen", *s_out);
++        MSG_DEBUG(NULL, "%s>> %s s:%p", __func__, "new_rfbScreen", *s_out);
 +
          return 0;
      }