Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
STJr
SRB2
Commits
3fb113e7
Unverified
Commit
3fb113e7
authored
5 years ago
by
Jaime Passos
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request
#18
from STJr/flats-png
Merge upstream's master into flats-png
parents
afa6afa5
f67f9405
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/r_data.c
+34
-36
34 additions, 36 deletions
src/r_data.c
src/sdl/mixer_sound.c
+2
-2
2 additions, 2 deletions
src/sdl/mixer_sound.c
src/w_wad.c
+9
-3
9 additions, 3 deletions
src/w_wad.c
with
45 additions
and
41 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
