Merge branch 'master' into next (626ac069) · Commits · SteelT / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

626ac069

Commit 626ac069 authored 1 year ago by Alam Ed Arias

Downloads
- Plain Diff

Merge branch 'master' into next

parents 7cb2fcd0 a1308d8a

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

.circleci/config.yml 8 additions, 30 deletions

.circleci/config.yml
.gitlab-ci.yml 0 additions, 62 deletions

.gitlab-ci.yml
src/Makefile.d/features.mk 1 addition, 0 deletions

src/Makefile.d/features.mk
src/Makefile.d/versions.mk 3 additions, 0 deletions

src/Makefile.d/versions.mk
src/doomdef.h 8 additions, 0 deletions

src/doomdef.h
src/m_menu.c 1 addition, 1 deletion

src/m_menu.c
src/netcode/mserv.c 1 addition, 1 deletion

src/netcode/mserv.c

with 22 additions and 94 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