Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

T

tarantool
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

f604478f

Commit f604478f authored 9 years ago by Roman Tsisyk

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into 1.6

Conflicts:
	cmake/luajit.cmake

parents c6e5f19b 098f9491

No related branches found

No related tags found

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

README.CentOS 1 addition, 1 deletion

README.CentOS
README.FreeBSD 1 addition, 1 deletion

README.FreeBSD
README.MacOSX 1 addition, 1 deletion

README.MacOSX
README.md 4 additions, 4 deletions

README.md
cmake/luajit.cmake 1 addition, 1 deletion

cmake/luajit.cmake
debian/control 1 addition, 1 deletion

debian/control
debian/rules 1 addition, 1 deletion

debian/rules
doc/sphinx/book/app/d_plugins.rst 2 additions, 2 deletions

doc/sphinx/book/app/d_plugins.rst
doc/sphinx/dev_guide/building_from_source.rst 2 additions, 2 deletions

doc/sphinx/dev_guide/building_from_source.rst
doc/sphinx/reference/tarantool.rst 1 addition, 1 deletion

doc/sphinx/reference/tarantool.rst
extra/rpm/tarantool.rpm.spec.in 1 addition, 1 deletion

extra/rpm/tarantool.rpm.spec.in
extra/travis/build_linux.sh 1 addition, 1 deletion

extra/travis/build_linux.sh
extra/travis/build_osx.sh 1 addition, 1 deletion

extra/travis/build_osx.sh

with 18 additions and 18 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment