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

f67f9405

Commit f67f9405 authored 5 years ago by Alam Ed Arias

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into flats-png

parents 0eb6b244 3e708e62

Branches

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/r_data.c 28 additions, 39 deletions

src/r_data.c
src/sdl/mixer_sound.c 2 additions, 2 deletions

src/sdl/mixer_sound.c
src/w_wad.c 9 additions, 3 deletions

src/w_wad.c

with 39 additions and 44 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