Merge commit '8e66ed73ab2371e89a548344e4ad26139e7d5db2' (internal branch... (f8d0833e) · 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

f8d0833e

Commit f8d0833e authored 2 months ago by Alam Ed Arias

Downloads
- Plain Diff

Merge commit '8e66ed73' (internal branch...

Merge commit '8e66ed73' (internal branch 2214)~1 into add-noipv4-flag

parents 0976bf9f 8e66ed73

No related branches found

No related tags found

Loading

Changes 168

Hide whitespace changes

Inline Side-by-side

Showing

assets/README.txt 1 addition, 1 deletion

assets/README.txt
assets/debian-template/copyright 2 additions, 2 deletions

assets/debian-template/copyright
debian-template/copyright 2 additions, 2 deletions

debian-template/copyright
doc/specs/udmf_srb2.txt 4 additions, 1 deletion

doc/specs/udmf_srb2.txt
extras/conf/udb/Includes/SRB222_common.cfg 1 addition, 1 deletion

extras/conf/udb/Includes/SRB222_common.cfg
extras/conf/udb/Includes/SRB222_misc.cfg 12 additions, 12 deletions

extras/conf/udb/Includes/SRB222_misc.cfg
scripts/arm64-osx-1015.cmake 7 additions, 0 deletions

scripts/arm64-osx-1015.cmake
scripts/make-macos-universal.sh 25 additions, 0 deletions

scripts/make-macos-universal.sh
scripts/x64-osx-1015.cmake 7 additions, 0 deletions

scripts/x64-osx-1015.cmake
src/apng.c 1 addition, 1 deletion

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

src/b_bot.c
src/byteptr.h 1 addition, 30 deletions

src/byteptr.h
src/command.c 40 additions, 39 deletions

src/command.c
src/command.h 6 additions, 5 deletions

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

src/config.h.in
src/console.c 1 addition, 1 deletion

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

src/console.h
src/d_main.c 8 additions, 8 deletions

src/d_main.c
src/d_player.h 1 addition, 1 deletion

src/d_player.h
src/dedicated/i_system.c 16 additions, 25 deletions

src/dedicated/i_system.c

with 140 additions and 133 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