Merge remote-tracking branch 'origin/master' into next (484b8e2c) · 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

484b8e2c

Commit 484b8e2c authored 4 years ago by James R.

Downloads
- Plain Diff

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

parents e47fbe7d d013dd0d

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

tools/masterserver/.gitignore 2 additions, 2 deletions

tools/masterserver/.gitignore
tools/masterserver/ipcs.h 1 addition, 1 deletion

tools/masterserver/ipcs.h
tools/masterserver/masterserver.sh 10 additions, 11 deletions

tools/masterserver/masterserver.sh
tools/masterserver/server.cpp 15 additions, 11 deletions

tools/masterserver/server.cpp
tools/masterserver/structure.sql 22 additions, 18 deletions

tools/masterserver/structure.sql

with 50 additions and 43 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