• 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
..
Communications Loading commit data...
Interfaces Loading commit data...
Log Loading commit data...
ObjectRepository Loading commit data...
Processes Loading commit data...
Services Loading commit data...
Timers Loading commit data...
Various Loading commit data...
Makefile.am Loading commit data...