Merge branch 'next' into load-netgame-error-fixes (b8ba2c5b) · 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

b8ba2c5b

Commit b8ba2c5b authored 3 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'next' into load-netgame-error-fixes

# Conflicts:
#	src/d_clisrv.c

parents 34fa9771 1355a82a

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/d_clisrv.c 2 additions, 10 deletions

src/d_clisrv.c
src/d_main.c 1 addition, 1 deletion

src/d_main.c
src/lua_consolelib.c 2 additions, 34 deletions

src/lua_consolelib.c

with 5 additions and 45 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