Merge branch 'master' of github.com:mailru/tarantool into sql
Conflicts: CMakeLists.txt src/CMakeLists.txt third_party/luajit
Showing
- .gitignore 58 additions, 64 deletions.gitignore
- .gitmodules 3 additions, 0 deletions.gitmodules
- CMakeLists.txt 20 additions, 35 deletionsCMakeLists.txt
- README.CentOS 8 additions, 0 deletionsREADME.CentOS
- README.md 2 additions, 3 deletionsREADME.md
- cfg/warning.c 1 addition, 1 deletioncfg/warning.c
- cfg/warning.h 1 addition, 1 deletioncfg/warning.h
- client/tarantool_checksum/tc_space.c 2 additions, 2 deletionsclient/tarantool_checksum/tc_space.c
- cmake/BuildLibOBJC.cmake 0 additions, 61 deletionscmake/BuildLibOBJC.cmake
- cmake/compiler.cmake 72 additions, 56 deletionscmake/compiler.cmake
- cmake/luajit.cmake 22 additions, 13 deletionscmake/luajit.cmake
- cmake/package.cmake 1 addition, 21 deletionscmake/package.cmake
- cmake/rpm.cmake 49 additions, 0 deletionscmake/rpm.cmake
- cmake/rpm_post_install.sh 0 additions, 8 deletionscmake/rpm_post_install.sh
- connector/c/include/tp.h 2 additions, 2 deletionsconnector/c/include/tp.h
- connector/c/tnt/CMakeLists.txt 2 additions, 4 deletionsconnector/c/tnt/CMakeLists.txt
- connector/c/tntnet/CMakeLists.txt 2 additions, 4 deletionsconnector/c/tntnet/CMakeLists.txt
- connector/c/tntrpl/CMakeLists.txt 2 additions, 4 deletionsconnector/c/tntrpl/CMakeLists.txt
- connector/c/tntsql/CMakeLists.txt 2 additions, 4 deletionsconnector/c/tntsql/CMakeLists.txt
- doc/developer/CMakeLists.txt 2 additions, 7 deletionsdoc/developer/CMakeLists.txt
Loading
Please register or sign in to comment