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

c33d163c

Commit c33d163c authored 5 years ago by MascaraSnake

Downloads
- Plain Diff

Merge branch 'nondevelop' into 'master'

Get 2.2(.0) release ready

Closes #461

See merge request STJr/SRB2Internal!615

parents 239242f5 0d22970c

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/config.h.in 6 additions, 6 deletions

src/config.h.in
src/d_main.c 14 additions, 26 deletions

src/d_main.c
src/doomdef.h 7 additions, 7 deletions

src/doomdef.h
src/w_wad.c 2 additions, 2 deletions

src/w_wad.c

with 29 additions and 41 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