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

bd8a2925

Commit bd8a2925 authored 11 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge branch 'stable'

Conflicts:
	.gitignore
	include/pickle.h
	test/unit/CMakeLists.txt
	third_party/luajit

parents 57119737 66c4dc69

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
cmake/BuildMisc.cmake 1 addition, 0 deletions

cmake/BuildMisc.cmake
include/pickle.h 0 additions, 29 deletions

include/pickle.h
src/box/box.cc 22 additions, 0 deletions

src/box/box.cc
src/box/tuple.cc 0 additions, 1 deletion

src/box/tuple.cc
src/box/tuple.h 24 additions, 0 deletions

src/box/tuple.h
test/unit/CMakeLists.txt 1 addition, 0 deletions

test/unit/CMakeLists.txt
test/unit/base64.c 40 additions, 0 deletions

test/unit/base64.c
test/unit/base64.result 9 additions, 0 deletions

test/unit/base64.result
test/unit/base64.test 1 addition, 0 deletions

test/unit/base64.test
test/unit/unit.h 1 addition, 0 deletions

test/unit/unit.h
third_party/base64.c 296 additions, 0 deletions

third_party/base64.c
third_party/base64.h 91 additions, 0 deletions

third_party/base64.h

with 487 additions and 30 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