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

0fd0cadf

Commit 0fd0cadf authored 13 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge branch 'ext-luajit'

Conflicts:
	CMakeLists.txt
	core/admin.m
	core/admin.rl

parents 2a754e20 db48931c

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 6 additions, 4 deletions

CMakeLists.txt
cmake/luajit.cmake 129 additions, 0 deletions

cmake/luajit.cmake
cmake/luatest.cpp 78 additions, 0 deletions

cmake/luatest.cpp
core/CMakeLists.txt 3 additions, 1 deletion

core/CMakeLists.txt
core/admin.m 57 additions, 56 deletions

core/admin.m
core/admin.rl 4 additions, 3 deletions

core/admin.rl
core/tarantool_lua.m 4 additions, 4 deletions

core/tarantool_lua.m
include/config.h.cmake 3 additions, 1 deletion

include/config.h.cmake
mod/box/box_lua.m 4 additions, 4 deletions

mod/box/box_lua.m
third_party/CMakeLists.txt 42 additions, 31 deletions

third_party/CMakeLists.txt

with 330 additions and 104 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