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

432cca75

Commit 432cca75 authored 5 years ago by SteelT

Downloads
- Plain Diff

Merge branch 'menu-soc-bullshit-mergefix' into 'master'

Menu soc bullshit mergefix

See merge request STJr/SRB2!933

parents 7ca886b0 e5bc0583

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/d_main.c 3 additions, 1 deletion

src/d_main.c
src/dehacked.c 5 additions, 0 deletions

src/dehacked.c
src/m_menu.c 63 additions, 63 deletions

src/m_menu.c
src/m_menu.h 6 additions, 0 deletions

src/m_menu.h

with 77 additions and 64 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