Merge branch 'master' into libbitset
Conflicts: third_party/README
Showing
- client/tarantool_checksum/CMakeLists.txt 3 additions, 0 deletionsclient/tarantool_checksum/CMakeLists.txt
- client/tarantool_checksum/tc_generate.c 2 additions, 2 deletionsclient/tarantool_checksum/tc_generate.c
- client/tarantool_checksum/tc_verify.c 0 additions, 1 deletionclient/tarantool_checksum/tc_verify.c
- cmake/BuildLibEIO.cmake 1 addition, 0 deletionscmake/BuildLibEIO.cmake
- cmake/BuildMisc.cmake 1 addition, 0 deletionscmake/BuildMisc.cmake
- doc/www-data.in/download.cmake 28 additions, 2 deletionsdoc/www-data.in/download.cmake
- include/assoc.h 2 additions, 2 deletionsinclude/assoc.h
- include/coeio.h 1 addition, 16 deletionsinclude/coeio.h
- include/coio.h 61 additions, 6 deletionsinclude/coio.h
- include/coio_buf.h 37 additions, 1 deletioninclude/coio_buf.h
- include/evio.h 25 additions, 3 deletionsinclude/evio.h
- include/ipc.h 0 additions, 2 deletionsinclude/ipc.h
- include/palloc.h 2 additions, 0 deletionsinclude/palloc.h
- include/sio.h 16 additions, 1 deletioninclude/sio.h
- src/CMakeLists.txt 1 addition, 0 deletionssrc/CMakeLists.txt
- src/asio.m 0 additions, 241 deletionssrc/asio.m
- src/coeio.m 110 additions, 121 deletionssrc/coeio.m
- src/coio.m 277 additions, 58 deletionssrc/coio.m
- src/evio.m 99 additions, 42 deletionssrc/evio.m
- src/ipc.m 2 additions, 4 deletionssrc/ipc.m
Loading
Please register or sign in to comment