Merge branch 'master' of github.com:mailru/tarantool
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- cmake/utils.cmake 19 additions, 0 deletionscmake/utils.cmake
- include/lua/uuid.h 0 additions, 42 deletionsinclude/lua/uuid.h
- src/CMakeLists.txt 12 additions, 2 deletionssrc/CMakeLists.txt
- src/box/CMakeLists.txt 7 additions, 21 deletionssrc/box/CMakeLists.txt
- src/box/box_lua.cc 1 addition, 1 deletionsrc/box/box_lua.cc
- src/lua/init.cc 11 additions, 2 deletionssrc/lua/init.cc
- src/lua/uuid.cc 0 additions, 153 deletionssrc/lua/uuid.cc
- src/lua/uuid.lua 35 additions, 0 deletionssrc/lua/uuid.lua
Loading
Please register or sign in to comment