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

401fdd68

Commit 401fdd68 authored 8 years ago by Nick Zavaritsky

Downloads
- Plain Diff

Merge branch '1.6' into 1.7

parents 6ba8500d d36ba279

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 14 additions, 9 deletions

CMakeLists.txt
cmake/luajit.cmake 6 additions, 6 deletions

cmake/luajit.cmake
src/say.c 1 addition, 1 deletion

src/say.c
src/trivia/config.h.cmake 1 addition, 0 deletions

src/trivia/config.h.cmake
src/trivia/util.h 1 addition, 1 deletion

src/trivia/util.h
third_party/tarantool_ev.h 0 additions, 2 deletions

third_party/tarantool_ev.h

with 23 additions and 19 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