Merge remote-tracking branch 'origin/next' into pictureformats (26e367eb) · Commits · STJr / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry

Snippets Groups Projects

26e367eb

Commit 26e367eb authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/next' into pictureformats

parents 2893803c bb56aa60

Loading

Changes 202

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 1 addition, 1 deletion

CMakeLists.txt
appveyor.yml 1 addition, 1 deletion

appveyor.yml
assets/CMakeLists.txt 2 additions, 1 deletion

assets/CMakeLists.txt
src/CMakeLists.txt 1 addition, 0 deletions

src/CMakeLists.txt
src/Makefile 1 addition, 1 deletion

src/Makefile
src/am_map.c 1 addition, 1 deletion

src/am_map.c
src/am_map.h 1 addition, 1 deletion

src/am_map.h
src/apng.c 1 addition, 1 deletion

src/apng.c
src/apng.h 1 addition, 1 deletion

src/apng.h
src/asm_defs.inc 1 addition, 1 deletion

src/asm_defs.inc
src/b_bot.c 1 addition, 1 deletion

src/b_bot.c
src/b_bot.h 1 addition, 1 deletion

src/b_bot.h
src/blua/Makefile.cfg 1 addition, 0 deletions

src/blua/Makefile.cfg
src/blua/linit.c 1 addition, 0 deletions

src/blua/linit.c
src/blua/liolib.c 635 additions, 0 deletions

src/blua/liolib.c
src/blua/lualib.h 3 additions, 0 deletions

src/blua/lualib.h
src/byteptr.h 1 addition, 1 deletion

src/byteptr.h
src/command.c 1 addition, 1 deletion

src/command.c
src/command.h 1 addition, 1 deletion

src/command.h
src/config.h.in 2 additions, 2 deletions

src/config.h.in

with 658 additions and 16 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