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

5d992786

Commit 5d992786 authored 9 years ago by Konstantin Osipov

Downloads
- Plain Diff

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

parents 30d1f232 a5c85349

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

cmake/compiler.cmake 2 additions, 3 deletions

cmake/compiler.cmake
cmake/luajit.cmake 40 additions, 36 deletions

cmake/luajit.cmake
cmake/module.cmake 12 additions, 3 deletions

cmake/module.cmake

with 54 additions and 42 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