Merge branch 'revert-09798876' into 'master' (27285365) · Commits · X.organic / 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

27285365

Commit 27285365 authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

Merge branch 'revert-09798876' into 'master'

Revert "Merge branch 'software-clownery' into 'master'"

See merge request STJr/SRB2!616

parents c460775c b41cd59e

Loading

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/p_setup.c 4 additions, 1 deletion

src/p_setup.c
src/r_bsp.c 1 addition, 1 deletion

src/r_bsp.c
src/r_defs.h 1 addition, 2 deletions

src/r_defs.h
src/r_main.c 3 additions, 3 deletions

src/r_main.c
src/r_segs.c 2574 additions, 2843 deletions

src/r_segs.c
src/r_state.h 5 additions, 36 deletions

src/r_state.h

with 2588 additions and 2886 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