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

b095f3a4

Commit b095f3a4 authored 10 years ago by Roman Tsisyk

Downloads
- Plain Diff

Merge branch 'stable'

Conflicts:
	CMakeLists.txt
	src/fiob.c

parents 659670e3 35bab795

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 1 addition, 0 deletions

CMakeLists.txt
src/fiob.c 140 additions, 92 deletions

src/fiob.c
src/fiob.h 0 additions, 2 deletions

src/fiob.h
src/trivia/config.h.cmake 5 additions, 0 deletions

src/trivia/config.h.cmake
test/unit/fiob.c 41 additions, 3 deletions

test/unit/fiob.c
test/unit/fiob.result 58 additions, 38 deletions

test/unit/fiob.result

with 245 additions and 135 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