Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

25acc29d

Commit 25acc29d authored 9 years ago by Luna

Downloads
- Plain Diff

Merge remote-tracking branch 'refs/remotes/STJr/master' into ems-rebuild

parents 3e9cf128 554c6289

No related branches found

No related tags found

Loading

Changes 4

Show whitespace changes

Inline Side-by-side

Showing

src/m_menu.c 3 additions, 0 deletions

src/m_menu.c
src/sdl/i_system.c 2 additions, 2 deletions

src/sdl/i_system.c
src/sdl/i_video.c 4 additions, 0 deletions

src/sdl/i_video.c
src/w_wad.h 0 additions, 2 deletions

src/w_wad.h

with 9 additions and 4 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