• Pavel Vainerman's avatar
    Merge remote-tracking branch '1.x/master' · c08f2b19
    Pavel Vainerman authored
    Conflicts:
    	Utilities/MBTester/mbrtuslave.cc
    	Utilities/MBTester/mbtcpserver.cc
    	conf/libuniset2.spec
    	extensions/IOControl/IOControl.cc
    	extensions/ModbusMaster/MBExchange.cc
    	extensions/ModbusSlave/MBSlave.cc
    	extensions/include/IOBase.h
    	extensions/lib/IOBase.cc
    c08f2b19
Name
Last commit
Last update
..
MBSlave.cc Loading commit data...
MBSlave.h Loading commit data...
MBTCPMultiSlave.cc Loading commit data...
MBTCPMultiSlave.h Loading commit data...
Makefile.am Loading commit data...
create_links.sh Loading commit data...
libUniSet2MBSlave.pc.in Loading commit data...
mbslave.cc Loading commit data...
mbtcp-multislave.cc Loading commit data...
start_fg.sh Loading commit data...
start_tcp2_fg.sh Loading commit data...
start_tcp_fg.sh Loading commit data...
start_tcp_fg2.sh Loading commit data...
start_tcp_multi_fg.sh Loading commit data...
test.xml Loading commit data...