• 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
..
tests Loading commit data...
MBExchange.cc Loading commit data...
MBExchange.h Loading commit data...
MBTCPMaster.cc Loading commit data...
MBTCPMaster.h Loading commit data...
MBTCPMultiMaster.cc Loading commit data...
MBTCPMultiMaster.h Loading commit data...
Makefile.am Loading commit data...
RTUExchange.cc Loading commit data...
RTUExchange.h Loading commit data...
RTUStorage.cc Loading commit data...
RTUStorage.h Loading commit data...
libUniSet2MBTCPMaster.pc.in Loading commit data...
libUniSet2RTU.pc.in Loading commit data...
main.cc Loading commit data...
mtr-conv.cc Loading commit data...
mtr-read.cc Loading commit data...
mtr-setup.cc Loading commit data...
multi-main.cc Loading commit data...
rtuexchange.cc Loading commit data...
rtustate.cc Loading commit data...
start_fg_mbrtu.sh Loading commit data...
start_fg_mbtcp.sh Loading commit data...
start_fg_mbtcpmulti.sh Loading commit data...
stop.sh Loading commit data...
test.xml Loading commit data...
uniset2-functions.sh Loading commit data...
uniset2-start.sh Loading commit data...
vtconv.cc Loading commit data...