Merge branch 'master' of

git+ssh://git@github.com/lategoodbye/libmbus.git Conflicts: mbus/mbus-protocol-aux.c
2012-10-04 22:43:06 +02:00
parent fef774d98d f7e238afdd
commit 606d238a6d
2 changed files with 3 additions and 17 deletions
--- a/bin/mbus-serial-request-data-multi-reply.c
+++ b/bin/mbus-serial-request-data-multi-reply.c
@ -31,7 +31,7 @@ init_slaves(mbus_handle *handle)
    if (mbus_send_ping_frame(handle, MBUS_ADDRESS_NETWORK_LAYER, 1) == -1)
    {
        return 0;
-    }
+    }  

    //
    // resend SND_NKE, maybe the first get lost