Conflicts:
	IDL/Processes/IOController_i.idl
	conf/libuniset.spec
	extensions/ModbusSlave/MBSlave.cc
	extensions/lib/IOBase.cc
	include/UniSetTypes.h
	src/Various/NCRestorer_XML.cc