Conflicts:
	IDL/Processes/IOController_i.idl
	IDL/UniSetTypes/UniSetManager_i.idl
	IDL/UniSetTypes/UniSetObject_i.idl
	IDL/UniSetTypes/UniSetTypes_i.idl
	TODO
	Utilities/Admin/admin.cc
	Utilities/MBTester/MBSlave.cc
	Utilities/MBTester/MBSlave.h
	Utilities/MBTester/MBTCPServer.cc
	Utilities/MBTester/MBTCPServer.h
	Utilities/MBTester/mbrtuslave.cc
	Utilities/MBTester/mbrtutester.cc
	Utilities/MBTester/mbslave.cc
	Utilities/MBTester/mbtcpserver.cc
	Utilities/MBTester/mbtcptester.cc
	Utilities/NullController/NullController.cc
	Utilities/NullController/NullController.h
	Utilities/NullController/main.cc
	Utilities/SImitator/main.cc
	Utilities/SMonit/smonitor.cc
	Utilities/SViewer-text/main.cc
	Utilities/codegen/ctl-cpp-cc-alone-ask.xsl
	Utilities/codegen/ctl-cpp-cc-ask.xsl
	Utilities/codegen/ctl-cpp-common.xsl
	Utilities/codegen/ctl-cpp-main-alone.xsl
	Utilities/codegen/ctl-cpp-main.xsl
	Utilities/codegen/skel-main.cc
	Utilities/codegen/skel.h
	Utilities/codegen/tests/TestGen.h
	Utilities/codegen/tests/TestGenAlone.h
	conf/test.xml
	configure.ac
	extensions/DBServer-MySQL/DBServer_MySQL.cc
	extensions/DBServer-MySQL/DBServer_MySQL.h
	extensions/DBServer-MySQL/MySQLInterface.cc
	extensions/DBServer-MySQL/MySQLInterface.h
	extensions/DBServer-MySQL/main.cc
	extensions/DBServer-MySQL/test.cc
	extensions/DBServer-SQLite/DBServer_SQLite.cc
	extensions/DBServer-SQLite/DBServer_SQLite.h
	extensions/DBServer-SQLite/SQLiteInterface.cc
	extensions/DBServer-SQLite/main.cc
	extensions/DBServer-SQLite/test.cc
	extensions/IOControl/ComediInterface.cc
	extensions/IOControl/ComediInterface.h
	extensions/IOControl/IOControl.cc
	extensions/IOControl/IOControl.h
	extensions/IOControl/iocalibr.cc
	extensions/IOControl/iocontrol.cc
	extensions/IOControl/iotest.cc
	extensions/LogicProcessor/Element.cc
	extensions/LogicProcessor/Element.h
	extensions/LogicProcessor/LProcessor.cc
	extensions/LogicProcessor/LProcessor.h
	extensions/LogicProcessor/PassiveLProcessor.h
	extensions/LogicProcessor/Schema.cc
	extensions/LogicProcessor/Schema.h
	extensions/LogicProcessor/SchemaXML.cc
	extensions/LogicProcessor/TAND.cc
	extensions/LogicProcessor/TDelay.cc
	extensions/LogicProcessor/TDelay.h
	extensions/LogicProcessor/TOR.cc
	extensions/LogicProcessor/plogicproc.cc
	extensions/ModbusMaster/MBExchange.cc
	extensions/ModbusMaster/MBExchange.h
	extensions/ModbusMaster/MBTCPMaster.cc
	extensions/ModbusMaster/MBTCPMaster.h
	extensions/ModbusMaster/MBTCPMultiMaster.cc
	extensions/ModbusMaster/MBTCPMultiMaster.h
	extensions/ModbusMaster/RTUExchange.cc
	extensions/ModbusMaster/RTUStorage.cc
	extensions/ModbusMaster/RTUStorage.h
	extensions/ModbusMaster/main.cc
	extensions/ModbusMaster/mtr-conv.cc
	extensions/ModbusMaster/mtr-read.cc
	extensions/ModbusMaster/mtr-setup.cc
	extensions/ModbusMaster/multi-main.cc
	extensions/ModbusMaster/rtuexchange.cc
	extensions/ModbusMaster/rtustate.cc
	extensions/ModbusMaster/vtconv.cc
	extensions/ModbusSlave/MBSlave.cc
	extensions/ModbusSlave/MBSlave.h
	extensions/ModbusSlave/MBTCPMultiSlave.cc
	extensions/ModbusSlave/mbslave.cc
	extensions/ModbusSlave/mbtcp-multislave.cc
	extensions/ModbusSlave/start_tcp_multi_fg.sh
	extensions/RRDServer/RRDServer.cc
	extensions/RRDServer/RRDServer.h
	extensions/RRDServer/main.cc
	extensions/SMDBServer/SMDBServer.cc
	extensions/SMDBServer/SMDBServer.h
	extensions/SMDBServer/main.cc
	extensions/SMViewer/SMViewer.h
	extensions/SharedMemory/SharedMemory.cc
	extensions/SharedMemory/SharedMemory.h
	extensions/SharedMemory/smemory.cc
	extensions/SharedMemoryPlus/smemory-plus.cc
	extensions/UNetUDP/UDPPacket.cc
	extensions/UNetUDP/UNetExchange.cc
	extensions/UNetUDP/UNetExchange.h
	extensions/UNetUDP/UNetReceiver.cc
	extensions/UNetUDP/UNetReceiver.h
	extensions/UNetUDP/UNetSender.cc
	extensions/UNetUDP/UNetSender.h
	extensions/UNetUDP/unet-udp-tester.cc
	extensions/UNetUDP/unetexchange.cc
	extensions/UniNetwork/UniExchange.cc
	extensions/UniNetwork/UniExchange.h
	extensions/UniNetwork/uninet.cc
	extensions/include/Calibration.h
	extensions/include/DigitalFilter.h
	extensions/include/Extensions.h
	extensions/include/IOBase.h
	extensions/include/MTR.h
	extensions/include/PID.h
	extensions/include/SMInterface.h
	extensions/include/SingleProcess.h
	extensions/include/VTypes.h
	extensions/lib/Calibration.cc
	extensions/lib/Extensions.cc
	extensions/lib/IOBase.cc
	extensions/lib/MTR.cc
	extensions/lib/PID.cc
	extensions/lib/SMInterface.cc
	extensions/lib/SingleProcess.cc
	extensions/lib/UObject_SK.cc
	extensions/tests/SMemoryTest/TestProc.cc
	extensions/tests/SMemoryTest/TestProc.h
	extensions/tests/SMemoryTest/smemory-test.cc
	extensions/tests/calibration.cc
	extensions/tests/digitalfilter.cc
	include/CallBackTimer.h
	include/ComPort.h
	include/ComPort485F.h
	include/Configuration.h
	include/DBServer.h
	include/Debug.h
	include/DebugStream.h
	include/DelayTimer.h
	include/Exceptions.h
	include/HourGlass.h
	include/IOController.h
	include/IONotifyController.h
	include/IORFile.h
	include/LT_Object.h
	include/MessageType.h
	include/Mutex.h
	include/NCRestorer.h
	include/ORepHelpers.h
	include/ObjectIndex.h
	include/ObjectIndex_Array.h
	include/ObjectRepository.h
	include/ObjectRepositoryFactory.h
	include/OmniThreadCreator.h
	include/PassiveObject.h
	include/PassiveTimer.h
	include/Pulse.h
	include/Restorer.h
	include/RunLock.h
	include/SMonitor.h
	include/SViewer.h
	include/ThreadCreator.h
	include/Trigger.h
	include/TriggerAND.h
	include/TriggerOR.h
	include/TriggerOutput.h
	include/UInterface.h
	include/UniSetActivator.h
	include/UniSetManager_LT.h
	include/UniSetTypes.h
	include/UniXML.h
	include/WDTInterface.h
	include/modbus/ModbusClient.h
	include/modbus/ModbusHelpers.h
	include/modbus/ModbusRTUMaster.h
	include/modbus/ModbusRTUSlave.h
	include/modbus/ModbusRTUSlaveSlot.h
	include/modbus/ModbusServer.h
	include/modbus/ModbusTCPMaster.h
	include/modbus/ModbusTCPServer.h
	include/modbus/ModbusTCPServerSlot.h
	include/modbus/ModbusTCPSession.h
	include/modbus/ModbusTypes.h
	include/modbus/TCPCheck.h
	python/lib/pyUniSet/Makefile.am
	python/lib/pyUniSet/PyUInterface.h
	python/lib/pyUniSet/UConnector.cc
	python/lib/pyUniSet/UConnector.h
	python/lib/pyUniSet/UConnector_wrap.cxx
	python/lib/pyUniSet/UExceptions.h
	python/lib/pyUniSet/UExceptions_wrap.cxx
	python/lib/pyUniSet/UInterface_wrap.cxx
	python/lib/pyUniSet/UModbus.cc
	python/lib/pyUniSet/UModbus.h
	python/lib/pyUniSet/UModbus_wrap.cxx
	python/lib/pyUniSet/UTypes.h
	python/lib/pyUniSet/pyUModbus.py
	src/Communications/ComPort.cc
	src/Communications/ComPort485F.cc
	src/Communications/Modbus/ModbusClient.cc
	src/Communications/Modbus/ModbusHelpers.cc
	src/Communications/Modbus/ModbusRTUMaster.cc
	src/Communications/Modbus/ModbusRTUSlave.cc
	src/Communications/Modbus/ModbusRTUSlaveSlot.cc
	src/Communications/Modbus/ModbusServer.cc
	src/Communications/Modbus/ModbusTCPCore.cc
	src/Communications/Modbus/ModbusTCPServer.cc
	src/Communications/Modbus/ModbusTCPServerSlot.cc
	src/Communications/Modbus/ModbusTCPSession.cc
	src/Communications/Modbus/ModbusTCPTypes.cc
	src/Communications/Modbus/ModbusTypes.cc
	src/Interfaces/UInterface.cc
	src/ObjectRepository/IORFile.cc
	src/ObjectRepository/ORepHelpers.cc
	src/ObjectRepository/ObjectIndex.cc
	src/ObjectRepository/ObjectIndex_Array.cc
	src/ObjectRepository/ObjectIndex_XML.cc
	src/ObjectRepository/ObjectIndex_idXML.cc
	src/ObjectRepository/ObjectRepository.cc
	src/ObjectRepository/ObjectRepositoryFactory.cc
	src/ObjectRepository/PassiveObject.cc
	src/ObjectRepository/ProxyManager.cc
	src/ObjectRepository/UniSetActivator.cc
	src/ObjectRepository/UniSetManager.cc
	src/ObjectRepository/UniSetManager_LT.cc
	src/ObjectRepository/UniSetObject.cc
	src/ObjectRepository/UniSetObject_LT.cc
	src/ObjectRepository/UniSetTypes.cc
	src/Processes/IOController.cc
	src/Processes/IONotifyController.cc
	src/Processes/IONotifyController_LT.cc
	src/Processes/NCRestorer_XML.cc
	src/Timers/PassiveSysTimer.cc
	src/Timers/WaitingPassiveTimer.cc
	src/Various/Configuration.cc
	src/Various/Debug.cc
	src/Various/DebugStream.cc
	src/Various/LT_Object.cc
	src/Various/Makefile.am
	src/Various/MessageType.cc
	src/Various/Mutex.cc
	src/Various/Restorer_XML.cc
	src/Various/RunLock.cc
	src/Various/SMonitor.cc
	src/Various/SViewer.cc
	src/Various/UniXML.cc
	src/Various/WDTInterface.cc
	tests/UniXmlTest/XmlTest.cc
	tests/calibration.cc
	tests/conftest.cc
	tests/delaytimer.cc
	tests/dlog.cc
	tests/hourglass.cc
	tests/iterator_test.cc
	tests/passivetimer.cc
	tests/threadtst.cc
	tests/ui.cc
	tests/umutex.cc
	tests/unixml.cc