Merge branch 'master' into next (96f74a3a) · 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

96f74a3a

Commit 96f74a3a authored 8 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'master' into next

parents fd5297ee 831c29ea

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/p_map.c 1 addition, 1 deletion

src/p_map.c
src/p_user.c 10 additions, 13 deletions

src/p_user.c
src/r_main.c 1 addition, 1 deletion

src/r_main.c

with 12 additions and 15 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