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;hp=ff3d78d4e1781afbac5d2e9e0fe8361f850bbccb

merge
---

diff --git a/hw_lem1802.c b/hw_lem1802.c
index c54455d..f8004a3 100644
--- a/hw_lem1802.c
+++ b/hw_lem1802.c
@@ -639,7 +639,7 @@ int lem1802_data_ctl_(struct dcpu16_hw *hw, const char *cmd, void *data_in, void
 
         *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;
     }
@@ -687,7 +687,7 @@ int lem1802_data_ctl_(struct dcpu16_hw *hw, const char *cmd, void *data_in, void
         for (r = lem1802_renderers_; r->renderer; r++) {
             if (strcmp(renderer, r->name) == 0) {
                 display->render = r->renderer;
-                MSG_DEBUG(hw->vm, "%s>> %s set to %s", __func__, "renderer", renderer);
+                MSG_DEBUG(hw->vm, "%s>> renderer set to %s", __func__, renderer);
                 return 0;
             }
         }