Merge branch 'master' of
git+ssh://git@github.com/lategoodbye/libmbus.git Conflicts: mbus/mbus-protocol-aux.c
This commit is contained in:
commit
606d238a6d
18
.gitignore
vendored
18
.gitignore
vendored
@ -21,10 +21,6 @@ src/config.h.in
|
|||||||
/m4
|
/m4
|
||||||
|
|
||||||
# configure stuff:
|
# configure stuff:
|
||||||
Makefile
|
|
||||||
bin/Makefile
|
|
||||||
mbus/Makefile
|
|
||||||
test/Makefile
|
|
||||||
config.log
|
config.log
|
||||||
config.status
|
config.status
|
||||||
libtool
|
libtool
|
||||||
@ -45,15 +41,5 @@ test/.deps
|
|||||||
*.la
|
*.la
|
||||||
*.lo
|
*.lo
|
||||||
.libs/
|
.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
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user