Merge branch 'master' of

git+ssh://git@github.com/lategoodbye/libmbus.git

Conflicts:
	mbus/mbus-protocol-aux.c

.gitignore

@@ -21,10 +21,6 @@ src/config.h.in
 /m4
 
 # configure stuff:
-Makefile
-bin/Makefile
-mbus/Makefile
-test/Makefile
 config.log
 config.status
 libtool
@@ -45,15 +41,5 @@ test/.deps
 *.la
 *.lo
 .libs/
-bin/libmbus.1
+!*.c
-bin/mbus-serial-request-data
+
-bin/mbus-serial-request-data-multi-reply
-bin/mbus-serial-scan
-bin/mbus-serial-scan-secondary
-bin/mbus-serial-select-secondary
-bin/mbus-serial-switch-baudrate
-bin/mbus-tcp-request-data
-bin/mbus-tcp-request-data-multi-reply
-bin/mbus-tcp-scan
-bin/mbus-tcp-scan-secondary
-bin/mbus-tcp-select-secondary

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