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

170c5f1d

Commit 170c5f1d authored 8 years ago by Roman Tsisyk

Downloads
- Plain Diff

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

parents a1880cee 12b89933

Loading

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 12 additions, 6 deletions

.travis.yml
cmake/luajit.cmake 1 addition, 1 deletion

cmake/luajit.cmake

with 13 additions and 7 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