1. 26 Nov, 2014 1 commit
  2. 25 Nov, 2014 2 commits
  3. 24 Nov, 2014 1 commit
  4. 23 Nov, 2014 5 commits
  5. 22 Nov, 2014 3 commits
  6. 17 Nov, 2014 1 commit
  7. 13 Nov, 2014 2 commits
  8. 11 Nov, 2014 3 commits
  9. 09 Nov, 2014 3 commits
  10. 08 Nov, 2014 2 commits
  11. 05 Nov, 2014 1 commit
  12. 04 Nov, 2014 2 commits
  13. 02 Nov, 2014 9 commits
  14. 01 Nov, 2014 3 commits
  15. 31 Oct, 2014 2 commits
    • Pavel Vainerman's avatar
    • Pavel Vainerman's avatar
      Merge remote-tracking branch '1.x/master' · 748b677b
      Pavel Vainerman authored
      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
      748b677b