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

1dd9f5e1

Commit 1dd9f5e1 authored 1 year ago by Alam Ed Arias

Downloads
- Plain Diff

Merge branch SRB2:next into fireflower-icon

parents 84f7b0cf a68440c4

Branches

Tags

Loading

Changes 136

Hide whitespace changes

Inline Side-by-side

Showing

.circleci/config.yml 22 additions, 19 deletions

.circleci/config.yml
.gitattributes 3 additions, 1 deletion

.gitattributes
.gitignore 1 addition, 0 deletions

.gitignore
.gitlab-ci.yml 434 additions, 0 deletions

.gitlab-ci.yml
appveyor.yml 1 addition, 1 deletion

appveyor.yml
cpdebug.mk 4 additions, 4 deletions

cpdebug.mk
extras/conf/SRB2-22.cfg 15 additions, 5 deletions

extras/conf/SRB2-22.cfg
extras/conf/udb/Includes/SRB222_things.cfg 16 additions, 5 deletions

extras/conf/udb/Includes/SRB222_things.cfg
src/Android.mk 1 addition, 6 deletions

src/Android.mk
src/CMakeLists.txt 2 additions, 7 deletions

src/CMakeLists.txt
src/Makefile 5 additions, 5 deletions

src/Makefile
src/Makefile.d/detect.mk 17 additions, 9 deletions

src/Makefile.d/detect.mk
src/Makefile.d/features.mk 66 additions, 68 deletions

src/Makefile.d/features.mk
src/Makefile.d/nix.mk 1 addition, 1 deletion

src/Makefile.d/nix.mk
src/Makefile.d/win32.mk 0 additions, 2 deletions

src/Makefile.d/win32.mk
src/Sourcefile 1 addition, 7 deletions

src/Sourcefile
src/am_map.c 0 additions, 1 deletion

src/am_map.c
src/android/i_net.c 1 addition, 1 deletion

src/android/i_net.c
src/blua/liolib.c 2 additions, 1 deletion

src/blua/liolib.c
src/command.c 3 additions, 2 deletions

src/command.c

with 595 additions and 145 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