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

42445b39

Commit 42445b39 authored 5 years ago by MascaraSnake

Downloads
- Plain Diff

Merge branch 'master' into next

parents 006b1e8c a2729dde

Branches

Tags

1 merge request!985Shaders next merge

Changes 2

Show whitespace changes

Inline Side-by-side

Showing

extras/conf/SRB2-22.cfg 75 additions, 35 deletions

extras/conf/SRB2-22.cfg
src/m_menu.c 19 additions, 2 deletions

src/m_menu.c

with 94 additions and 37 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