Conflicts:
	conf/libuniset2.spec
	extensions/DBServer-MySQL/libUniSetMySQL.pc.in
	extensions/DBServer-SQLite/Makefile.am
	extensions/DBServer-SQLite/SQLiteInterface.cc
	extensions/DBServer-SQLite/libUniSetSQLite.pc.in
	extensions/DBServer-SQLite/test.cc
	extensions/IOControl/libUniSetIOControl.pc.in
	extensions/LogicProcessor/libUniSetLogicProcessor.pc.in
	extensions/ModbusMaster/MBExchange.cc
	extensions/ModbusMaster/libUniSetMBTCPMaster.pc.in
	extensions/ModbusMaster/libUniSetRTU.pc.in
	extensions/ModbusSlave/MBSlave.cc
	extensions/ModbusSlave/libUniSetMBSlave.pc.in
	extensions/RRDServer/libUniSetRRDServer.pc.in
	extensions/SMDBServer/libUniSet2SMDBServer.pc.in
	extensions/SharedMemory/libUniSetSharedMemory.pc.in
	extensions/UNetUDP/libUniSetUNetUDP.pc.in
	extensions/UniNetwork/libUniSetNetwork.pc.in
	extensions/lib/IOBase.cc
	extensions/libUniSetExtensions.pc.in
	libUniSet2.pc.in