Merge remote-tracking branch 'origin/master' into 1.6
Conflicts: src/rmean.cc
No related branches found
No related tags found
Showing
- .gitignore 3 additions, 0 deletions.gitignore
- Doxyfile 9 additions, 9 deletionsDoxyfile
- Doxyfile.API.in 7 additions, 0 deletionsDoxyfile.API.in
- README.md 1 addition, 1 deletionREADME.md
- cmake/module.cmake 1 addition, 1 deletioncmake/module.cmake
- doc/CMakeLists.txt 0 additions, 2 deletionsdoc/CMakeLists.txt
- doc/sphinx/CMakeLists.txt 12 additions, 1 deletiondoc/sphinx/CMakeLists.txt
- doc/sphinx/conf.py 5 additions, 1 deletiondoc/sphinx/conf.py
- doc/sphinx/reference/capi.rst 6 additions, 0 deletionsdoc/sphinx/reference/capi.rst
- doc/sphinx/reference/index.rst 1 addition, 0 deletionsdoc/sphinx/reference/index.rst
- doc/www/content/newsite/index.yml 5 additions, 5 deletionsdoc/www/content/newsite/index.yml
- src/box/box.cc 53 additions, 34 deletionssrc/box/box.cc
- src/box/box.h 119 additions, 10 deletionssrc/box/box.h
- src/box/engine.cc 15 additions, 24 deletionssrc/box/engine.cc
- src/box/engine.h 19 additions, 10 deletionssrc/box/engine.h
- src/box/error.h 43 additions, 11 deletionssrc/box/error.h
- src/box/index.cc 2 additions, 2 deletionssrc/box/index.cc
- src/box/index.h 119 additions, 5 deletionssrc/box/index.h
- src/box/iproto.cc 27 additions, 10 deletionssrc/box/iproto.cc
- src/box/iproto_port.h 2 additions, 2 deletionssrc/box/iproto_port.h
Loading
Please register or sign in to comment