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

49d0b61d

Commit 49d0b61d authored 8 years ago by Roman Tsisyk

Downloads
- Plain Diff

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

parents cde0b0a6 2e4a17dc

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/CMakeLists.txt 2 additions, 1 deletion

src/CMakeLists.txt
src/clock.c 0 additions, 0 deletions

src/clock.c
src/clock.h 4 additions, 0 deletions

src/clock.h
src/ffisyms.cc 1 addition, 1 deletion

src/ffisyms.cc
test/app-tap/module_api.c 19 additions, 0 deletions

test/app-tap/module_api.c
test/app-tap/module_api.result 2 additions, 1 deletion

test/app-tap/module_api.result
test/app-tap/module_api.test.lua 1 addition, 1 deletion

test/app-tap/module_api.test.lua

with 29 additions and 4 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