• Pavel Vainerman's avatar
    Merge remote-tracking branch '1.x/master' · 1e7c5b2d
    Pavel Vainerman authored
    Conflicts:
    	conf/libuniset2.spec
    	conf/test.xml
    	extensions/ModbusMaster/MBExchange.cc
    	extensions/ModbusMaster/MBExchange.h
    	extensions/UNetUDP/UNetExchange.cc
    	extensions/UNetUDP/UNetReceiver.cc
    	extensions/UNetUDP/UNetReceiver.h
    	extensions/UNetUDP/UNetSender.h
    	extensions/lib/MTR.cc
    	src/Communications/Modbus/ModbusTCPMaster.cc
    1e7c5b2d
Name
Last commit
Last update
..
Modbus Loading commit data...
TCP Loading commit data...
ComPort.cc Loading commit data...
ComPort485F.cc Loading commit data...
Makefile.am Loading commit data...