Merge branch 'stable'
Conflicts: test/CMakeLists.txt
No related branches found
No related tags found
Showing
- CMakeLists.txt 3 additions, 0 deletionsCMakeLists.txt
- README.MacOSX 44 additions, 3 deletionsREADME.MacOSX
- cmake/os.cmake 17 additions, 3 deletionscmake/os.cmake
- cmake/package.cmake 12 additions, 0 deletionscmake/package.cmake
- extra/CMakeLists.txt 23 additions, 0 deletionsextra/CMakeLists.txt
- extra/dmg/DESCRIPTION.rtf 26 additions, 0 deletionsextra/dmg/DESCRIPTION.rtf
- extra/dmg/LICENSE.rtf 23 additions, 0 deletionsextra/dmg/LICENSE.rtf
- extra/dmg/README.rtf 43 additions, 0 deletionsextra/dmg/README.rtf
- extra/dmg/postflight.in 22 additions, 0 deletionsextra/dmg/postflight.in
- extra/org.tarantool.in 31 additions, 0 deletionsextra/org.tarantool.in
- test/CMakeLists.txt 13 additions, 6 deletionstest/CMakeLists.txt
- test/share/tarantool_dmg.cfg 45 additions, 0 deletionstest/share/tarantool_dmg.cfg
Loading
Please register or sign in to comment